diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2007-08-26 19:50:05 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2008-10-21 07:47:08 -0400 |
commit | 86d434dede14108dd917b25af0f29c0cb28b8d18 (patch) | |
tree | f69305e5213ac9eab854b8c85a918fd71c106e06 /drivers/block/swim3.c | |
parent | aeb5d727062a0238a2f96c9c380fbd2be4640c6f (diff) |
[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/swim3.c')
-rw-r--r-- | drivers/block/swim3.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/block/swim3.c b/drivers/block/swim3.c index a53ca54bee12..5c45d5556ae8 100644 --- a/drivers/block/swim3.c +++ b/drivers/block/swim3.c | |||
@@ -904,10 +904,10 @@ static int floppy_open(struct inode *inode, struct file *filp) | |||
904 | swim3_action(fs, SETMFM); | 904 | swim3_action(fs, SETMFM); |
905 | swim3_select(fs, RELAX); | 905 | swim3_select(fs, RELAX); |
906 | 906 | ||
907 | } else if (fs->ref_count == -1 || filp->f_flags & O_EXCL) | 907 | } else if (fs->ref_count == -1 || filp->f_mode & FMODE_EXCL) |
908 | return -EBUSY; | 908 | return -EBUSY; |
909 | 909 | ||
910 | if (err == 0 && (filp->f_flags & O_NDELAY) == 0 | 910 | if (err == 0 && (filp->f_mode & FMODE_NDELAY) == 0 |
911 | && (filp->f_mode & (FMODE_READ|FMODE_WRITE))) { | 911 | && (filp->f_mode & (FMODE_READ|FMODE_WRITE))) { |
912 | check_disk_change(inode->i_bdev); | 912 | check_disk_change(inode->i_bdev); |
913 | if (fs->ejected) | 913 | if (fs->ejected) |
@@ -930,7 +930,7 @@ static int floppy_open(struct inode *inode, struct file *filp) | |||
930 | return err; | 930 | return err; |
931 | } | 931 | } |
932 | 932 | ||
933 | if (filp->f_flags & O_EXCL) | 933 | if (filp->f_mode & FMODE_EXCL) |
934 | fs->ref_count = -1; | 934 | fs->ref_count = -1; |
935 | else | 935 | else |
936 | ++fs->ref_count; | 936 | ++fs->ref_count; |