summaryrefslogtreecommitdiff
path: root/fs/block_dev.c
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2007-08-26 19:50:05 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2008-10-21 07:47:08 -0400
commit86d434dede14108dd917b25af0f29c0cb28b8d18 (patch)
treef69305e5213ac9eab854b8c85a918fd71c106e06 /fs/block_dev.c
parentaeb5d727062a0238a2f96c9c380fbd2be4640c6f (diff)
downloadlinux-3.10-86d434dede14108dd917b25af0f29c0cb28b8d18.tar.gz
linux-3.10-86d434dede14108dd917b25af0f29c0cb28b8d18.tar.bz2
linux-3.10-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 'fs/block_dev.c')
-rw-r--r--fs/block_dev.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/fs/block_dev.c b/fs/block_dev.c
index 8897f3b02e9..b9022694e9f 100644
--- a/fs/block_dev.c
+++ b/fs/block_dev.c
@@ -1007,6 +1007,13 @@ static int do_open(struct block_device *bdev, struct file *file, int for_part)
return ret;
}
+ if (file->f_flags & O_NDELAY)
+ file->f_mode |= FMODE_NDELAY;
+ if (file->f_flags & O_EXCL)
+ file->f_mode |= FMODE_EXCL;
+ if ((file->f_flags & O_ACCMODE) == 3)
+ file->f_mode |= FMODE_WRITE_IOCTL;
+
ret = -ENXIO;
file->f_mapping = bdev->bd_inode->i_mapping;