vfs: kill FMODE_NDELAY_NOW
Subsystems (3)
PATCH 7/11 vfs: kill FMODE_NDELAY_NOW
From: Christoph Hellwig <[email protected]>
Update FMODE_NDELAY before each ioctl call so that we can kill the magic FMODE_NDELAY_NOW. It would be even better to do this directly in setfl(), but for that we'd need to have FMODE_NDELAY for all files, not just block special files.
Signed-off-by Christoph Hellwig <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
---
block/compat_ioctl.c | 8 +++++++- drivers/scsi/sd.c | 2 +- drivers/scsi/sr.c | 2 +- fs/block_dev.c | 10 +++++++++- include/linux/fs.h | 1 - 5 files changed, 18 insertions(+), 5 deletions(-)
block/compat_ioctl.c renamed from block/compat_ioctl.c~vfs-kill-fmode_ndelay_now +7 -1
@@ -699,8 +699,14 @@ long compat_blkdev_ioctl(struct file *fistruct backing_dev_info *bdi;loff_t size; +/* +* O_NDELAY can be altered using fcntl(.., F_SETFL, ..), so we have +* to updated it before every ioctl. +*/ if (file->f_flags &O_NDELAY ) - mode |=FMODE_NDELAY_NOW ; + mode |=FMODE_NDELAY ; +else + mode &= ~FMODE_NDELAY ;switch (cmd) {case HDIO_GETGEO :
drivers/scsi/sd.c renamed from drivers/scsi/sd.c~vfs-kill-fmode_ndelay_now +1 -1
@@ -757,7 +757,7 @@ static int sd_ioctl(struct block_device* access to the device is prohibited. */ error =scsi_nonblockable_ioctl (sdp, cmd, p, - (mode &FMODE_NDELAY_NOW ) !=0 ); + (mode &FMODE_NDELAY ) !=0 );if (!scsi_block_when_processing_errors (sdp) || !error)return error;
drivers/scsi/sr.c renamed from drivers/scsi/sr.c~vfs-kill-fmode_ndelay_now +1 -1
@@ -521,7 +521,7 @@ static int sr_block_ioctl(struct block_d* if it doesn't recognise the ioctl */ ret =scsi_nonblockable_ioctl (sdev, cmd, argp, - (mode &FMODE_NDELAY_NOW ) !=0 ); + (mode &FMODE_NDELAY ) !=0 );if (ret != -ENODEV )return ret;return scsi_ioctl (sdev, cmd, argp);
fs/block_dev.c renamed from fs/block_dev.c~vfs-kill-fmode_ndelay_now +9 -1
@@ -1218,8 +1218,16 @@ static long block_ioctl(struct file *fil {struct block_device *bdev =I_BDEV (file->f_mapping->host);fmode_t mode = file->f_mode; + +/* +* O_NDELAY can be altered using fcntl(.., F_SETFL, ..), so we have +* to updated it before every ioctl. +*/ if (file->f_flags &O_NDELAY ) - mode |=FMODE_NDELAY_NOW ; + mode |=FMODE_NDELAY ; +else + mode &= ~FMODE_NDELAY ; +return blkdev_ioctl (bdev, mode, cmd, arg); }
include/linux/fs.h renamed from include/linux/fs.h~vfs-kill-fmode_ndelay_now +0 -1
@@ -70,7 +70,6 @@ struct inodes_stat_t {#define FMODE_NDELAY ((__force fmode_t)32)#define FMODE_EXCL ((__force fmode_t)64)#define FMODE_WRITE_IOCTL ((__force fmode_t)128) -#define FMODE_NDELAY_NOW ((__force fmode_t)256)#define RW_MASK 1#define RWA_MASK 2
_