diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2007-08-27 01:50:05 +0200 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2008-10-21 13:47:08 +0200 |
| commit | 86d434dede14108dd917b25af0f29c0cb28b8d18 (patch) | |
| tree | f69305e5213ac9eab854b8c85a918fd71c106e06 /drivers/block/ataflop.c | |
| parent | [PATCH] introduce fmode_t, do annotations (diff) | |
| download | linux-86d434dede14108dd917b25af0f29c0cb28b8d18.tar.xz linux-86d434dede14108dd917b25af0f29c0cb28b8d18.zip | |
[PATCH] eliminate use of ->f_flags in block methods
store needed information in f_mode
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'drivers/block/ataflop.c')
| -rw-r--r-- | drivers/block/ataflop.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/block/ataflop.c b/drivers/block/ataflop.c index e1db285b72cd..85d56a26f7c6 100644 --- a/drivers/block/ataflop.c +++ b/drivers/block/ataflop.c @@ -1813,17 +1813,17 @@ static int floppy_open( struct inode *inode, struct file *filp ) if (p->ref && p->type != type) return -EBUSY; - if (p->ref == -1 || (p->ref && filp->f_flags & O_EXCL)) + if (p->ref == -1 || (p->ref && filp->f_mode & FMODE_EXCL)) return -EBUSY; - if (filp->f_flags & O_EXCL) + if (filp->f_mode & FMODE_EXCL) p->ref = -1; else p->ref++; p->type = type; - if (filp->f_flags & O_NDELAY) + if (filp->f_mode & FMODE_NDELAY) return 0; if (filp->f_mode & (FMODE_READ|FMODE_WRITE)) { |