decouple block open flags from fmode_t
Subsystems (45)
Christoph Hellwig
maintainerHi all,
this series adds a new blk_mode_t for block open flags instead of abusing fmode_t. The block open flags work very different from the normal use of fmode_t and only share the basic READ/WRITE flags with it. None of the other normal FMODE_* flags is used, but instead there are three block-specific ones not used by anyone else, which can now be removed.
Note that I've only CCed maintainers and lists for drivers and file systems that have non-trivial changes, as otherwise the series would spam literally everyone in the block and file system world.
Diffstat:
arch/um/drivers/ubd_kern.c | 20 ++----- arch/xtensa/platforms/iss/simdisk.c | 6 +- block/bdev.c | 99 ++++++++++++++++++------------------ block/blk-zoned.c | 12 ++-- block/blk.h | 26 ++++++++- block/bsg-lib.c | 2 block/bsg.c | 8 +- block/disk-events.c | 47 +++++++---------- block/fops.c | 54 ++++++++++++------- block/genhd.c | 13 ++-- block/ioctl.c | 61 +++++++--------------- drivers/block/amiflop.c | 20 +++---- drivers/block/aoe/aoeblk.c | 8 +- drivers/block/ataflop.c | 43 +++++++-------- drivers/block/drbd/drbd_main.c | 13 ++-- drivers/block/drbd/drbd_nl.c | 23 +++++--- drivers/block/floppy.c | 72 +++++++++++++------------- drivers/block/loop.c | 24 ++++---- drivers/block/mtip32xx/mtip32xx.c | 4 - drivers/block/nbd.c | 12 ++-- drivers/block/pktcdvd.c | 36 ++++++------- drivers/block/rbd.c | 6 +- drivers/block/rnbd/rnbd-clt.c | 8 +- drivers/block/rnbd/rnbd-srv-sysfs.c | 3 - drivers/block/rnbd/rnbd-srv.c | 23 ++++---- drivers/block/rnbd/rnbd-srv.h | 2 drivers/block/sunvdc.c | 2 drivers/block/swim.c | 24 ++++---- drivers/block/swim3.c | 33 +++++------- drivers/block/ublk_drv.c | 4 - drivers/block/xen-blkback/xenbus.c | 4 - drivers/block/xen-blkfront.c | 2 drivers/block/z2ram.c | 8 +- drivers/block/zram/zram_drv.c | 21 +++---- drivers/cdrom/cdrom.c | 36 +++---------- drivers/cdrom/gdrom.c | 12 ++-- drivers/md/bcache/bcache.h | 2 drivers/md/bcache/request.c | 4 - drivers/md/bcache/super.c | 25 ++++----- drivers/md/dm-cache-target.c | 12 ++-- drivers/md/dm-clone-target.c | 10 +-- drivers/md/dm-core.h | 7 +- drivers/md/dm-era-target.c | 6 +- drivers/md/dm-ioctl.c | 10 +-- drivers/md/dm-snap.c | 4 - drivers/md/dm-table.c | 11 ++-- drivers/md/dm-thin.c | 9 +-- drivers/md/dm-verity-fec.c | 2 drivers/md/dm-verity-target.c | 6 +- drivers/md/dm.c | 20 +++---- drivers/md/dm.h | 2 drivers/md/md.c | 50 +++++++++--------- drivers/mmc/core/block.c | 12 ++-- drivers/mtd/devices/block2mtd.c | 6 +- drivers/mtd/mtd_blkdevs.c | 8 +- drivers/mtd/mtdblock.c | 2 drivers/mtd/ubi/block.c | 9 +-- drivers/nvme/host/core.c | 6 +- drivers/nvme/host/ioctl.c | 66 +++++++++++++----------- drivers/nvme/host/multipath.c | 6 +- drivers/nvme/host/nvme.h | 4 - drivers/nvme/target/io-cmd-bdev.c | 4 - drivers/s390/block/dasd.c | 10 +-- drivers/s390/block/dasd_genhd.c | 5 + drivers/s390/block/dasd_int.h | 3 - drivers/s390/block/dasd_ioctl.c | 2 drivers/s390/block/dcssblk.c | 11 +--- drivers/scsi/ch.c | 3 - drivers/scsi/scsi_bsg.c | 4 - drivers/scsi/scsi_ioctl.c | 38 ++++++------- drivers/scsi/sd.c | 39 ++++++-------- drivers/scsi/sg.c | 7 +- drivers/scsi/sr.c | 22 ++++---- drivers/scsi/st.c | 2 drivers/target/target_core_iblock.c | 9 +-- drivers/target/target_core_pscsi.c | 10 +-- fs/btrfs/dev-replace.c | 6 +- fs/btrfs/ioctl.c | 12 ++-- fs/btrfs/super.c | 21 ++----- fs/btrfs/volumes.c | 55 +++++++++----------- fs/btrfs/volumes.h | 11 +--- fs/erofs/super.c | 7 +- fs/ext4/super.c | 11 +--- fs/f2fs/super.c | 12 ++-- fs/jfs/jfs_logmgr.c | 6 +- fs/nfs/blocklayout/dev.c | 9 +-- fs/nilfs2/super.c | 12 +--- fs/ocfs2/cluster/heartbeat.c | 7 +- fs/reiserfs/journal.c | 19 +++--- fs/reiserfs/reiserfs.h | 1 fs/super.c | 33 ++++-------- fs/xfs/xfs_super.c | 15 ++--- include/linux/blkdev.h | 68 +++++++++++------------- include/linux/bsg.h | 2 include/linux/cdrom.h | 12 ++-- include/linux/device-mapper.h | 8 +- include/linux/fs.h | 8 -- include/linux/mtd/blktrans.h | 2 include/scsi/scsi_ioctl.h | 4 - kernel/power/hibernate.c | 12 +--- kernel/power/power.h | 2 kernel/power/swap.c | 28 ++++------ mm/swapfile.c | 7 +- 103 files changed, 796 insertions(+), 853 deletions(-)
Christoph Hellwig
maintainerPATCH 1/31 block: also call ->open for incremental partition opens
For whole devices ->open is called for each open, but for partitions it is only called on the first open of a partition. This is problematic as various block drivers look at open flags and might not do all setup for ioctl only or NDELAY opens.
--- block/bdev.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-)
block/bdev.c +8 -10
@@ -683,9 +683,6 @@ static int blkdev_get_part(struct block_device *part, fmode_t mode)struct gendisk *disk = part->bd_disk;int ret; -if (atomic_read (&part->bd_openers)) - goto done; - ret =blkdev_get_whole (bdev_whole (part), mode);if (ret)return ret;
@@ -694,9 +691,10 @@ static int blkdev_get_part(struct block_device *part, fmode_t mode)if (!bdev_nr_sectors (part)) goto out_blkdev_put; - disk->open_partitions++; -set_init_blocksize (part); -done: +if (!atomic_read (&part->bd_openers)) { + disk->open_partitions++; +set_init_blocksize (part); + }atomic_inc (&part->bd_openers);return 0 ;
@@ -709,10 +707,10 @@ static void blkdev_put_part(struct block_device *part, fmode_t mode) {struct block_device *whole =bdev_whole (part); -if (!atomic_dec_and_test (&part->bd_openers)) -return ; -blkdev_flush_mapping (part); - whole->bd_disk->open_partitions--; +if (atomic_dec_and_test (&part->bd_openers)) { +blkdev_flush_mapping (part); + whole->bd_disk->open_partitions--; + }blkdev_put_whole (whole, mode); }
Signature · 1 line
2.39.2
Re: [PATCH 01/31] block: also call ->open for incremental partition opens
Quoted 7 lines · Christoph Hellwig
For whole devices ->open is called for each open, but for partitions it is only called on the first open of a partition. This is problematic as various block drivers look at open flags and might not do all setup for ioctl only or NDELAY opens.
Signed-off-by Christoph Hellwig <[email protected]>---
This assumes that all drivers deal with additional ->open() calls for each partition correctly which I assumed you checked so,
Christoph Hellwig
maintainerRe: [PATCH 01/31] block: also call ->open for incremental partition opens
Quoted 2 lines · Christian Brauner
This assumes that all drivers deal with additional ->open() calls for each partition correctly which I assumed you checked so,
They have to, because they already get the additional open for extra opens of the whole device. The current behavior is:
open("/dev/vdb", ...)
->open called
open("/dev/vdb", ...)
->open called
----
open("/dev/vdb", ...)
->open called
open("/dev/vdb1", ...)
->open called
----
open("/dev/vdb1", ...)
->open called
open("/dev/vdb1", ...)
->open NOT called
which is very inconsistent.
Re: [PATCH 01/31] block: also call ->open for incremental partition opens
In reply to Christoph HellwigQuoted 10 lines · Christoph Hellwig
For whole devices ->open is called for each open, but for partitions it is only called on the first open of a partition. This is problematic as various block drivers look at open flags and might not do all setup for ioctl only or NDELAY opens.
Signed-off-by Christoph Hellwig <[email protected]>--- block/bdev.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-)
Cheers,
Hannes
Christoph Hellwig
maintainerPATCH 2/31 cdrom: remove the unused bdev argument to cdrom_open
In reply to Christoph Hellwig--- drivers/cdrom/cdrom.c | 3 +-- drivers/cdrom/gdrom.c | 2 +- drivers/scsi/sr.c | 2 +- include/linux/cdrom.h | 3 +-- 4 files changed, 4 insertions(+), 6 deletions(-)
drivers/cdrom/cdrom.c +1 -2
@@ -1155,8 +1155,7 @@ int open_for_data(struct cdrom_device_info *cdi)* is in their own interest: device control becomes a lot easier * this way. */ -int cdrom_open (struct cdrom_device_info *cdi,struct block_device *bdev, -fmode_t mode) +int cdrom_open (struct cdrom_device_info *cdi,fmode_t mode) {int ret;
drivers/cdrom/gdrom.c +1 -1
@@ -481,7 +481,7 @@ static int gdrom_bdops_open(struct block_device *bdev, fmode_t mode)bdev_check_media_change (bdev);mutex_lock (&gdrom_mutex); - ret =cdrom_open (gd.cd_info, bdev, mode); + ret =cdrom_open (gd.cd_info, mode);mutex_unlock (&gdrom_mutex);return ret; }
drivers/scsi/sr.c +1 -1
@@ -498,7 +498,7 @@ static int sr_block_open(struct block_device *bdev, fmode_t mode)sr_revalidate_disk (cd);mutex_lock (&cd->lock); - ret =cdrom_open (&cd->cdi, bdev, mode); + ret =cdrom_open (&cd->cdi, mode);mutex_unlock (&cd->lock);scsi_autopm_put_device (sdev);
include/linux/cdrom.h +1 -2
@@ -101,8 +101,7 @@ int cdrom_read_tocentry(struct cdrom_device_info *cdi, struct cdrom_tocentry *entry);/* the general block_device operations structure: */ -extern int cdrom_open (struct cdrom_device_info *cdi,struct block_device *bdev, -fmode_t mode); +int cdrom_open (struct cdrom_device_info *cdi,fmode_t mode);extern void cdrom_release (struct cdrom_device_info *cdi,fmode_t mode);extern int cdrom_ioctl (struct cdrom_device_info *cdi,struct block_device *bdev,fmode_t mode,unsigned int cmd,unsigned long arg);
Signature · 1 line
2.39.2
Phillip Potter
maintainerRe: [PATCH 02/31] cdrom: remove the unused bdev argument to cdrom_open
Quoted 65 lines · Christoph Hellwig
Signed-off-by Christoph Hellwig <[email protected]>--- drivers/cdrom/cdrom.c | 3 +-- drivers/cdrom/gdrom.c | 2 +- drivers/scsi/sr.c | 2 +- include/linux/cdrom.h | 3 +-- 4 files changed, 4 insertions(+), 6 deletions(-)drivers/cdrom/cdrom.c +1
-2@@ -1155,8 +1155,7 @@ int open_for_data(struct cdrom_device_info *cdi)* is in their own interest: device control becomes a lot easier * this way. */ -int cdrom_open (struct cdrom_device_info *cdi,struct block_device *bdev, -fmode_t mode) +int cdrom_open (struct cdrom_device_info *cdi,fmode_t mode) {int ret;drivers/cdrom/gdrom.c +1
-1@@ -481,7 +481,7 @@ static int gdrom_bdops_open(struct block_device *bdev, fmode_t mode)bdev_check_media_change (bdev);mutex_lock (&gdrom_mutex); - ret =cdrom_open (gd.cd_info, bdev, mode); + ret =cdrom_open (gd.cd_info, mode);mutex_unlock (&gdrom_mutex);return ret; }drivers/scsi/sr.c +1
-1@@ -498,7 +498,7 @@ static int sr_block_open(struct block_device *bdev, fmode_t mode)sr_revalidate_disk (cd);mutex_lock (&cd->lock); - ret =cdrom_open (&cd->cdi, bdev, mode); + ret =cdrom_open (&cd->cdi, mode);mutex_unlock (&cd->lock);scsi_autopm_put_device (sdev);include/linux/cdrom.h +1
-2@@ -101,8 +101,7 @@ int cdrom_read_tocentry(struct cdrom_device_info *cdi, struct cdrom_tocentry *entry);/* the general block_device operations structure: */ -extern int cdrom_open (struct cdrom_device_info *cdi,struct block_device *bdev, -fmode_t mode); +int cdrom_open (struct cdrom_device_info *cdi,fmode_t mode);extern void cdrom_release (struct cdrom_device_info *cdi,fmode_t mode);extern int cdrom_ioctl (struct cdrom_device_info *cdi,struct block_device *bdev,fmode_t mode,unsigned int cmd,unsigned long arg);Signature · 1 line
2.39.2
Thanks for the patch, looks good to me.
Regards,
Phil
Re: [PATCH 02/31] cdrom: remove the unused bdev argument to cdrom_open
In reply to Christoph HellwigQuoted 2 lines · Christoph Hellwig
Signed-off-by Christoph Hellwig <[email protected]>---
lgtm,
Re: [PATCH 02/31] cdrom: remove the unused bdev argument to cdrom_open
In reply to Christoph HellwigQuoted 8 lines · Christoph Hellwig
Signed-off-by Christoph Hellwig <[email protected]>--- drivers/cdrom/cdrom.c | 3 +-- drivers/cdrom/gdrom.c | 2 +- drivers/scsi/sr.c | 2 +- include/linux/cdrom.h | 3 +-- 4 files changed, 4 insertions(+), 6 deletions(-)
Cheers,
Hannes
Christoph Hellwig
maintainerPATCH 3/31 cdrom: remove the unused mode argument to cdrom_ioctl
In reply to Christoph Hellwig--- drivers/cdrom/cdrom.c | 2 +- drivers/cdrom/gdrom.c | 2 +- drivers/scsi/sr.c | 2 +- include/linux/cdrom.h | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-)
drivers/cdrom/cdrom.c +1 -1
@@ -3336,7 +3336,7 @@ static int mmc_ioctl(struct cdrom_device_info *cdi, unsigned int cmd,* ATAPI / SCSI specific code now mainly resides in mmc_ioctl(). */ int cdrom_ioctl (struct cdrom_device_info *cdi,struct block_device *bdev, -fmode_t mode,unsigned int cmd,unsigned long arg) +unsigned int cmd,unsigned long arg) {void __user *argp = (void __user *)arg;int ret;
drivers/cdrom/gdrom.c +1 -1
@@ -505,7 +505,7 @@ static int gdrom_bdops_ioctl(struct block_device *bdev, fmode_t mode,int ret;mutex_lock (&gdrom_mutex); - ret =cdrom_ioctl (gd.cd_info, bdev, mode, cmd, arg); + ret =cdrom_ioctl (gd.cd_info, bdev, cmd, arg);mutex_unlock (&gdrom_mutex);return ret;
drivers/scsi/sr.c +1 -1
@@ -539,7 +539,7 @@ static int sr_block_ioctl(struct block_device *bdev, fmode_t mode, unsigned cmd,scsi_autopm_get_device (sdev);if (cmd !=CDROMCLOSETRAY && cmd !=CDROMEJECT ) { - ret =cdrom_ioctl (&cd->cdi, bdev, mode, cmd, arg); + ret =cdrom_ioctl (&cd->cdi, bdev, cmd, arg);if (ret != -ENOSYS ) goto put; }
include/linux/cdrom.h +2 -2
@@ -103,8 +103,8 @@ int cdrom_read_tocentry(struct cdrom_device_info *cdi,/* the general block_device operations structure: */ int cdrom_open (struct cdrom_device_info *cdi,fmode_t mode);extern void cdrom_release (struct cdrom_device_info *cdi,fmode_t mode); -extern int cdrom_ioctl (struct cdrom_device_info *cdi,struct block_device *bdev, -fmode_t mode,unsigned int cmd,unsigned long arg); +int cdrom_ioctl (struct cdrom_device_info *cdi,struct block_device *bdev, +unsigned int cmd,unsigned long arg);extern unsigned int cdrom_check_events (struct cdrom_device_info *cdi,unsigned int clearing);
Signature · 1 line
2.39.2
Phillip Potter
maintainerRe: [PATCH 03/31] cdrom: remove the unused mode argument to cdrom_ioctl
Quoted 65 lines · Christoph Hellwig
Signed-off-by Christoph Hellwig <[email protected]>--- drivers/cdrom/cdrom.c | 2 +- drivers/cdrom/gdrom.c | 2 +- drivers/scsi/sr.c | 2 +- include/linux/cdrom.h | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-)drivers/cdrom/cdrom.c +1
-1@@ -3336,7 +3336,7 @@ static int mmc_ioctl(struct cdrom_device_info *cdi, unsigned int cmd,* ATAPI / SCSI specific code now mainly resides in mmc_ioctl(). */ int cdrom_ioctl (struct cdrom_device_info *cdi,struct block_device *bdev, -fmode_t mode,unsigned int cmd,unsigned long arg) +unsigned int cmd,unsigned long arg) {void __user *argp = (void __user *)arg;int ret;drivers/cdrom/gdrom.c +1
-1@@ -505,7 +505,7 @@ static int gdrom_bdops_ioctl(struct block_device *bdev, fmode_t mode,int ret;mutex_lock (&gdrom_mutex); - ret =cdrom_ioctl (gd.cd_info, bdev, mode, cmd, arg); + ret =cdrom_ioctl (gd.cd_info, bdev, cmd, arg);mutex_unlock (&gdrom_mutex);return ret;drivers/scsi/sr.c +1
-1@@ -539,7 +539,7 @@ static int sr_block_ioctl(struct block_device *bdev, fmode_t mode, unsigned cmd,scsi_autopm_get_device (sdev);if (cmd !=CDROMCLOSETRAY && cmd !=CDROMEJECT ) { - ret =cdrom_ioctl (&cd->cdi, bdev, mode, cmd, arg); + ret =cdrom_ioctl (&cd->cdi, bdev, cmd, arg);if (ret != -ENOSYS ) goto put; }include/linux/cdrom.h +2
-2@@ -103,8 +103,8 @@ int cdrom_read_tocentry(struct cdrom_device_info *cdi,/* the general block_device operations structure: */ int cdrom_open (struct cdrom_device_info *cdi,fmode_t mode);extern void cdrom_release (struct cdrom_device_info *cdi,fmode_t mode); -extern int cdrom_ioctl (struct cdrom_device_info *cdi,struct block_device *bdev, -fmode_t mode,unsigned int cmd,unsigned long arg); +int cdrom_ioctl (struct cdrom_device_info *cdi,struct block_device *bdev, +unsigned int cmd,unsigned long arg);extern unsigned int cdrom_check_events (struct cdrom_device_info *cdi,unsigned int clearing);Signature · 1 line
2.39.2
Thanks, looks good.
Regards,
Phil
Re: [PATCH 03/31] cdrom: remove the unused mode argument to cdrom_ioctl
In reply to Christoph HellwigQuoted 2 lines · Christoph Hellwig
Signed-off-by Christoph Hellwig <[email protected]>---
Looks good to me,
Re: [PATCH 03/31] cdrom: remove the unused mode argument to cdrom_ioctl
In reply to Christoph HellwigQuoted 8 lines · Christoph Hellwig
Signed-off-by Christoph Hellwig <[email protected]>--- drivers/cdrom/cdrom.c | 2 +- drivers/cdrom/gdrom.c | 2 +- drivers/scsi/sr.c | 2 +- include/linux/cdrom.h | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-)
Cheers,
Hannes
Christoph Hellwig
maintainerPATCH 4/31 cdrom: remove the unused cdrom_close_write release code
In reply to Christoph Hellwigcdrom_close_write is empty, and the for_data flag it is keyed off is never set. Remove all this clutter.
--- drivers/cdrom/cdrom.c | 15 --------------- include/linux/cdrom.h | 1 - 2 files changed, 16 deletions(-)
drivers/cdrom/cdrom.c +0 -15
@@ -978,15 +978,6 @@ static void cdrom_dvd_rw_close_write(struct cdrom_device_info *cdi) cdi->media_written =0 ; } -static int cdrom_close_write (struct cdrom_device_info *cdi) -{ -#if 0 -return cdrom_flush_cache (cdi); -#else -return 0 ; -#endif -} -/* badly broken, I know. Is due for a fixup anytime. */ static void cdrom_count_tracks (struct cdrom_device_info *cdi,tracktype *tracks) {
@@ -1282,12 +1273,6 @@ void cdrom_release(struct cdrom_device_info *cdi, fmode_t mode) opened_for_data = !(cdi->options &CDO_USE_FFLAGS ) || !(mode &FMODE_NDELAY ); -/* -* flush cache on last write release -*/ -if (CDROM_CAN (CDC_RAM ) && !cdi->use_count && cdi->for_data) -cdrom_close_write (cdi); - cdo->release (cdi);if (cdi->use_count ==0 ) {/* last process that closes dev*/ if (opened_for_data &&
include/linux/cdrom.h +0 -1
@@ -61,7 +61,6 @@ struct cdrom_device_info {__u8 last_sense;__u8 media_written;/* dirty flag, DVD+RW bookkeeping */ unsigned short mmc3_profile;/* current MMC3 profile */ -int for_data;int (*exit)(struct cdrom_device_info *);int mrw_mode_page;__s64 last_media_change_ms;
Signature · 1 line
2.39.2
Phillip Potter
maintainerRe: [PATCH 04/31] cdrom: remove the unused cdrom_close_write release code
Quoted 57 lines · Christoph Hellwig
cdrom_close_writeis empty, and thefor_dataflag it is keyed off is never set. Remove all this clutter.Signed-off-by Christoph Hellwig <[email protected]>--- drivers/cdrom/cdrom.c | 15 --------------- include/linux/cdrom.h | 1 - 2 files changed, 16 deletions(-)drivers/cdrom/cdrom.c +0
-15@@ -978,15 +978,6 @@ static void cdrom_dvd_rw_close_write(struct cdrom_device_info *cdi) cdi->media_written =0 ; } -static int cdrom_close_write (struct cdrom_device_info *cdi) -{ -#if 0 -return cdrom_flush_cache (cdi); -#else -return 0 ; -#endif -} -/* badly broken, I know. Is due for a fixup anytime. */ static void cdrom_count_tracks (struct cdrom_device_info *cdi,tracktype *tracks) {@@ -1282,12 +1273,6 @@ void cdrom_release(struct cdrom_device_info *cdi, fmode_t mode) opened_for_data = !(cdi->options &CDO_USE_FFLAGS ) || !(mode &FMODE_NDELAY ); -/* -* flush cache on last write release -*/ -if (CDROM_CAN (CDC_RAM ) && !cdi->use_count && cdi->for_data) -cdrom_close_write (cdi); - cdo->release (cdi);if (cdi->use_count ==0 ) {/* last process that closes dev*/ if (opened_for_data &&include/linux/cdrom.h +0
-1@@ -61,7 +61,6 @@ struct cdrom_device_info {__u8 last_sense;__u8 media_written;/* dirty flag, DVD+RW bookkeeping */ unsigned short mmc3_profile;/* current MMC3 profile */ -int for_data;int (*exit)(struct cdrom_device_info *);int mrw_mode_page;__s64 last_media_change_ms;Signature · 1 line
2.39.2
All good, many thanks.
Regards,
Phil
Re: [PATCH 04/31] cdrom: remove the unused cdrom_close_write release code
In reply to Christoph HellwigQuoted 5 lines · Christoph Hellwig
cdrom_close_writeis empty, and thefor_dataflag it is keyed off is never set. Remove all this clutter.Signed-off-by Christoph Hellwig <[email protected]>---
Looks good to me,
Re: [PATCH 04/31] cdrom: remove the unused cdrom_close_write release code
In reply to Christoph HellwigQuoted 9 lines · Christoph Hellwig
cdrom_close_writeis empty, and thefor_dataflag it is keyed off is never set. Remove all this clutter.Signed-off-by Christoph Hellwig <[email protected]>--- drivers/cdrom/cdrom.c | 15 --------------- include/linux/cdrom.h | 1 - 2 files changed, 16 deletions(-)
Cheers,
Hannes
Christoph Hellwig
maintainerPATCH 5/31 cdrom: track if a cdrom_device_info was opened for data
In reply to Christoph HellwigSet a flag when a cdrom_device_info is opened for writing, instead of trying to figure out this at release time. This will allow to eventually remove the mode argument to the ->release block_device_operation as nothing but the CDROM drivers uses that argument.
--- drivers/cdrom/cdrom.c | 12 +++++------- include/linux/cdrom.h | 1 + 2 files changed, 6 insertions(+), 7 deletions(-)
drivers/cdrom/cdrom.c +5 -7
@@ -1172,6 +1172,7 @@ int cdrom_open(struct cdrom_device_info *cdi, fmode_t mode) ret =0 ; cdi->media_written =0 ; } + cdi->opened_for_data = true; }if (ret)
@@ -1252,7 +1253,6 @@ static int check_for_audio_disc(struct cdrom_device_info *cdi,void cdrom_release (struct cdrom_device_info *cdi,fmode_t mode) {const struct cdrom_device_ops *cdo = cdi->ops; -int opened_for_data;cd_dbg (CD_CLOSE ,"entering cdrom_release\n" );
@@ -1270,14 +1270,12 @@ void cdrom_release(struct cdrom_device_info *cdi, fmode_t mode) } } - opened_for_data = !(cdi->options &CDO_USE_FFLAGS ) || - !(mode &FMODE_NDELAY ); - cdo->release (cdi); -if (cdi->use_count ==0 ) {/* last process that closes dev*/ -if (opened_for_data && - cdi->options &CDO_AUTO_EJECT &&CDROM_CAN (CDC_OPEN_TRAY )) + +if (cdi->use_count ==0 && cdi->opened_for_data) { +if (cdi->options &CDO_AUTO_EJECT &&CDROM_CAN (CDC_OPEN_TRAY )) cdo->tray_move (cdi,1 ); + cdi->opened_for_data = false; } }EXPORT_SYMBOL (cdrom_release);
include/linux/cdrom.h +1 -0
@@ -64,6 +64,7 @@ struct cdrom_device_info {int (*exit)(struct cdrom_device_info *);int mrw_mode_page;__s64 last_media_change_ms; +bool opened_for_data; };struct cdrom_device_ops {
Signature · 1 line
2.39.2
Phillip Potter
maintainerRe: [PATCH 05/31] cdrom: track if a cdrom_device_info was opened for data
Quoted 65 lines · Christoph Hellwig
Set a flag when a
cdrom_device_infois opened for writing, instead of trying to figure out this at release time. This will allow to eventually remove the mode argument to the ->releaseblock_device_operationas nothing but the CDROM drivers uses that argument.Signed-off-by Christoph Hellwig <[email protected]>--- drivers/cdrom/cdrom.c | 12 +++++------- include/linux/cdrom.h | 1 + 2 files changed, 6 insertions(+), 7 deletions(-)drivers/cdrom/cdrom.c +5
-7@@ -1172,6 +1172,7 @@ int cdrom_open(struct cdrom_device_info *cdi, fmode_t mode) ret =0 ; cdi->media_written =0 ; } + cdi->opened_for_data = true; }if (ret)@@ -1252,7 +1253,6 @@ static int check_for_audio_disc(struct cdrom_device_info *cdi,void cdrom_release (struct cdrom_device_info *cdi,fmode_t mode) {const struct cdrom_device_ops *cdo = cdi->ops; -int opened_for_data;cd_dbg (CD_CLOSE ,"entering cdrom_release\n" );@@ -1270,14 +1270,12 @@ void cdrom_release(struct cdrom_device_info *cdi, fmode_t mode) } } - opened_for_data = !(cdi->options &CDO_USE_FFLAGS ) || - !(mode &FMODE_NDELAY ); - cdo->release (cdi); -if (cdi->use_count ==0 ) {/* last process that closes dev*/ -if (opened_for_data && - cdi->options &CDO_AUTO_EJECT &&CDROM_CAN (CDC_OPEN_TRAY )) + +if (cdi->use_count ==0 && cdi->opened_for_data) { +if (cdi->options &CDO_AUTO_EJECT &&CDROM_CAN (CDC_OPEN_TRAY )) cdo->tray_move (cdi,1 ); + cdi->opened_for_data = false; } }EXPORT_SYMBOL (cdrom_release);include/linux/cdrom.h +1
-0@@ -64,6 +64,7 @@ struct cdrom_device_info {int (*exit)(struct cdrom_device_info *);int mrw_mode_page;__s64 last_media_change_ms; +bool opened_for_data; };struct cdrom_device_ops {Signature · 1 line
2.39.2
Looks good, thanks.
Regards,
Phil
Re: [PATCH 05/31] cdrom: track if a cdrom_device_info was opened for data
In reply to Christoph HellwigQuoted 7 lines · Christoph Hellwig
Set a flag when a
cdrom_device_infois opened for writing, instead of trying to figure out this at release time. This will allow to eventually remove the mode argument to the ->releaseblock_device_operationas nothing but the CDROM drivers uses that argument.Signed-off-by Christoph Hellwig <[email protected]>---
Looks good to me,
Re: [PATCH 05/31] cdrom: track if a cdrom_device_info was opened for data
In reply to Christoph HellwigQuoted 55 lines · Christoph Hellwig
Set a flag when a
cdrom_device_infois opened for writing, instead of trying to figure out this at release time. This will allow to eventually remove the mode argument to the ->releaseblock_device_operationas nothing but the CDROM drivers uses that argument.Signed-off-by Christoph Hellwig <[email protected]>--- drivers/cdrom/cdrom.c | 12 +++++------- include/linux/cdrom.h | 1 + 2 files changed, 6 insertions(+), 7 deletions(-)drivers/cdrom/cdrom.c +5
-7@@ -1172,6 +1172,7 @@ int cdrom_open(struct cdrom_device_info *cdi, fmode_t mode) ret =0 ; cdi->media_written =0 ; } + cdi->opened_for_data = true; }if (ret)@@ -1252,7 +1253,6 @@ static int check_for_audio_disc(struct cdrom_device_info *cdi,void cdrom_release (struct cdrom_device_info *cdi,fmode_t mode) {const struct cdrom_device_ops *cdo = cdi->ops; -int opened_for_data;cd_dbg (CD_CLOSE ,"entering cdrom_release\n" );@@ -1270,14 +1270,12 @@ void cdrom_release(struct cdrom_device_info *cdi, fmode_t mode) } } - opened_for_data = !(cdi->options &CDO_USE_FFLAGS ) || - !(mode &FMODE_NDELAY ); - cdo->release (cdi); -if (cdi->use_count ==0 ) {/* last process that closes dev*/ -if (opened_for_data && - cdi->options &CDO_AUTO_EJECT &&CDROM_CAN (CDC_OPEN_TRAY )) + +if (cdi->use_count ==0 && cdi->opened_for_data) { +if (cdi->options &CDO_AUTO_EJECT &&CDROM_CAN (CDC_OPEN_TRAY )) cdo->tray_move (cdi,1 ); + cdi->opened_for_data = false; } }EXPORT_SYMBOL (cdrom_release);include/linux/cdrom.h +0
-0
include/linux/cdrom.h struct cdrom_device_info { · line 70
Quoted 7 lines
include/linux/cdrom.h +1
-0@@ -64,6 +64,7 @@ struct cdrom_device_info {int (*exit)(struct cdrom_device_info *);int mrw_mode_page;__s64 last_media_change_ms; +bool opened_for_data; };struct cdrom_device_ops {
Do we care about alignment here?
integer followed by a 64 bit value followed by a bool seems like an automatic padding to me ...
Cheers,
Hannes
Christoph Hellwig
maintainerRe: [PATCH 05/31] cdrom: track if a cdrom_device_info was opened for data
Quoted 4 lines · Hannes Reinecke
Quoted 4 lines
+++
b/include/linux/cdrom.hinclude/linux/cdrom.h +0
-0@@ -64,6 +64,7 @@ struct cdrom_device_info {int (*exit)(struct cdrom_device_info *);int mrw_mode_page;
Quoted 8 lines
include/linux/cdrom.h struct cdrom_device_info { · line 70
Quoted 4 lines
include/linux/cdrom.h +1
-0__s64 last_media_change_ms; +bool opened_for_data; };struct cdrom_device_ops {Do we care about alignment here?
integer followed by a 64 bit value followed by a bool seems like an automatic padding to me ...
I don't think the structure matter much here, but placing it before last_media_change_ms still seems better. I'll change it.
Christoph Hellwig
maintainerPATCH 6/31 cdrom: remove the unused mode argument to cdrom_release
In reply to Christoph Hellwig--- drivers/cdrom/cdrom.c | 2 +- drivers/cdrom/gdrom.c | 2 +- drivers/scsi/sr.c | 2 +- include/linux/cdrom.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-)
drivers/cdrom/cdrom.c +1 -1
@@ -1250,7 +1250,7 @@ static int check_for_audio_disc(struct cdrom_device_info *cdi,return 0 ; } -void cdrom_release (struct cdrom_device_info *cdi,fmode_t mode) +void cdrom_release (struct cdrom_device_info *cdi) {const struct cdrom_device_ops *cdo = cdi->ops;
drivers/cdrom/gdrom.c +1 -1
@@ -481,7 +481,7 @@ static int gdrom_bdops_open(struct block_device *bdev, fmode_t mode)bdev_check_media_change (bdev);mutex_lock (&gdrom_mutex); - ret =cdrom_open (gd.cd_info, mode); + ret =cdrom_open (gd.cd_info);mutex_unlock (&gdrom_mutex);return ret; }
drivers/scsi/sr.c +1 -1
@@ -512,7 +512,7 @@ static void sr_block_release(struct gendisk *disk, fmode_t mode)struct scsi_cd *cd =scsi_cd (disk);mutex_lock (&cd->lock); -cdrom_release (&cd->cdi, mode); +cdrom_release (&cd->cdi);mutex_unlock (&cd->lock);scsi_device_put (cd->device);
include/linux/cdrom.h +1 -1
@@ -102,7 +102,7 @@ int cdrom_read_tocentry(struct cdrom_device_info *cdi,/* the general block_device operations structure: */ int cdrom_open (struct cdrom_device_info *cdi,fmode_t mode); -extern void cdrom_release (struct cdrom_device_info *cdi,fmode_t mode); +void cdrom_release (struct cdrom_device_info *cdi);int cdrom_ioctl (struct cdrom_device_info *cdi,struct block_device *bdev,unsigned int cmd,unsigned long arg); extern unsigned int cdrom_check_events(struct cdrom_device_info *cdi,
Signature · 1 line
2.39.2
Phillip Potter
maintainerRe: [PATCH 06/31] cdrom: remove the unused mode argument to cdrom_release
Quoted 63 lines · Christoph Hellwig
Signed-off-by Christoph Hellwig <[email protected]>--- drivers/cdrom/cdrom.c | 2 +- drivers/cdrom/gdrom.c | 2 +- drivers/scsi/sr.c | 2 +- include/linux/cdrom.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-)drivers/cdrom/cdrom.c +1
-1@@ -1250,7 +1250,7 @@ static int check_for_audio_disc(struct cdrom_device_info *cdi,return 0 ; } -void cdrom_release (struct cdrom_device_info *cdi,fmode_t mode) +void cdrom_release (struct cdrom_device_info *cdi) {const struct cdrom_device_ops *cdo = cdi->ops;drivers/cdrom/gdrom.c +1
-1@@ -481,7 +481,7 @@ static int gdrom_bdops_open(struct block_device *bdev, fmode_t mode)bdev_check_media_change (bdev);mutex_lock (&gdrom_mutex); - ret =cdrom_open (gd.cd_info, mode); + ret =cdrom_open (gd.cd_info);mutex_unlock (&gdrom_mutex);return ret; }drivers/scsi/sr.c +1
-1@@ -512,7 +512,7 @@ static void sr_block_release(struct gendisk *disk, fmode_t mode)struct scsi_cd *cd =scsi_cd (disk);mutex_lock (&cd->lock); -cdrom_release (&cd->cdi, mode); +cdrom_release (&cd->cdi);mutex_unlock (&cd->lock);scsi_device_put (cd->device);include/linux/cdrom.h +1
-1@@ -102,7 +102,7 @@ int cdrom_read_tocentry(struct cdrom_device_info *cdi,/* the general block_device operations structure: */ int cdrom_open (struct cdrom_device_info *cdi,fmode_t mode); -extern void cdrom_release (struct cdrom_device_info *cdi,fmode_t mode); +void cdrom_release (struct cdrom_device_info *cdi);int cdrom_ioctl (struct cdrom_device_info *cdi,struct block_device *bdev,unsigned int cmd,unsigned long arg); extern unsigned int cdrom_check_events(struct cdrom_device_info *cdi,Signature · 1 line
2.39.2
Looks good, thanks.
Regards,
Phil
Christoph Hellwig
maintainerRe: [PATCH 06/31] cdrom: remove the unused mode argument to cdrom_release
Quoted 3 lines · Phillip Potter
Looks good, thanks.
Signed-off-by Phillip Potter <[email protected]>
Hmm, these signoffs don't really make sense here. Were they intended as Reviewed-bys?
Phillip Potter
maintainerRe: [PATCH 06/31] cdrom: remove the unused mode argument to cdrom_release
Quoted 8 lines · Christoph Hellwig
Quoted 3 lines · Phillip Potter
Looks good, thanks.
Signed-off-by Phillip Potter <[email protected]>Hmm, these signoffs don't really make sense here. Were they intended as Reviewed-bys?
Hi Christoph,
Yes indeed - I was under the impression it was appropriate for a maintainer to signal their approval of a patch to maintained code using a Signed-off-by tag due to their involvement in the submission process? Apologies if I've got this wrong, happy to send Reviewed-bys by all means.
Regards,
Phil
Christoph Hellwig
maintainerRe: [PATCH 06/31] cdrom: remove the unused mode argument to cdrom_release
Quoted 5 lines · Phillip Potter
Yes indeed - I was under the impression it was appropriate for a maintainer to signal their approval of a patch to maintained code using a Signed-off-by tag due to their involvement in the submission process? Apologies if I've got this wrong, happy to send Reviewed-bys by all means.
Signed-off-by is for the chain that the patches pass through. You add it when you apply or forward the patch. Just give me a Reviewed-by tag and say it shold apply to patches 1 to 6 and I'll add it.
Re: [PATCH 06/31] cdrom: remove the unused mode argument to cdrom_release
Quoted 10 lines · Christoph Hellwig
Quoted 5 lines · Phillip Potter
Yes indeed - I was under the impression it was appropriate for a maintainer to signal their approval of a patch to maintained code using a Signed-off-by tag due to their involvement in the submission process? Apologies if I've got this wrong, happy to send Reviewed-bys by all means.
Signed-off-by is for the chain that the patches pass through. You add it when you apply or forward the patch. Just give me a Reviewed-by tag and say it shold apply to patches 1 to 6 and I'll add it.
Thanks for the guidance. Please apply the following to the block patch
(1) and the CD-ROM patches (2-6) of your series, all looks good to me:
Regards,
Phil
Re: [PATCH 06/31] cdrom: remove the unused mode argument to cdrom_release
In reply to Christoph HellwigQuoted 2 lines · Christoph Hellwig
Signed-off-by Christoph Hellwig <[email protected]>---
Looks good to me,
Re: [PATCH 06/31] cdrom: remove the unused mode argument to cdrom_release
In reply to Christoph HellwigQuoted 8 lines · Christoph Hellwig
Signed-off-by Christoph Hellwig <[email protected]>--- drivers/cdrom/cdrom.c | 2 +- drivers/cdrom/gdrom.c | 2 +- drivers/scsi/sr.c | 2 +- include/linux/cdrom.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-)
Cheers,
Hannes
Re: [PATCH 06/31] cdrom: remove the unused mode argument to cdrom_release
In reply to Christoph HellwigQuoted 2 lines · Christoph Hellwig
Signed-off-by Christoph Hellwig <[email protected]>---
$ git grep cdrom_release
Documentation/cdrom/cdrom-standard.rst: cdrom_release, /* release */
Documentation/cdrom/cdrom-standard.rst:the door, should be left over to the general routine *cdrom_release()*.
Documentation/cdrom/cdrom-standard.rst: void cdrom_release(struct inode *ip, struct file *fp)
^^^^^^^^^^^^^^^^^
drivers/cdrom/cdrom.c:void cdrom_release(struct cdrom_device_info *cdi)
drivers/cdrom/cdrom.c: cd_dbg(CD_CLOSE, "entering cdrom_release\n");
drivers/cdrom/cdrom.c:EXPORT_SYMBOL(cdrom_release);
drivers/cdrom/gdrom.c: cdrom_release(gd.cd_info, mode);
^^^^^^
drivers/scsi/sr.c: cdrom_release(&cd->cdi);
include/linux/cdrom.h:void cdrom_release(struct cdrom_device_info *cdi);$ git grep cdrom_open
Documentation/cdrom/cdrom-standard.rst: cdrom_open, /* open */
Documentation/cdrom/cdrom-standard.rst: int cdrom_open(struct inode * ip, struct file * fp)
Documentation/cdrom/cdrom-standard.rst:This function implements the reverse-logic of *cdrom_open()*, and then
drivers/cdrom/cdrom.c:static int cdrom_open_write(struct cdrom_device_info *cdi)
drivers/cdrom/cdrom.c:int cdrom_open(struct cdrom_device_info *cdi, blk_mode_t mode)
drivers/cdrom/cdrom.c: cd_dbg(CD_OPEN, "entering cdrom_open\n");
drivers/cdrom/cdrom.c: if (cdrom_open_write(cdi))
drivers/cdrom/cdrom.c:EXPORT_SYMBOL(cdrom_open);
drivers/cdrom/gdrom.c: ret = cdrom_open(gd.cd_info);
^^^^^^^^^^
drivers/scsi/sr.c: ret = cdrom_open(&cd->cdi, mode);
include/linux/cdrom.h:int cdrom_open(struct cdrom_device_info *cdi, blk_mode_t mode);Quoted 65 lines
drivers/cdrom/cdrom.c | 2 +- drivers/cdrom/gdrom.c | 2 +- drivers/scsi/sr.c | 2 +- include/linux/cdrom.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-)drivers/cdrom/cdrom.c +1
-1@@ -1250,7 +1250,7 @@ static int check_for_audio_disc(struct cdrom_device_info *cdi,return 0 ; } -void cdrom_release (struct cdrom_device_info *cdi,fmode_t mode) +void cdrom_release (struct cdrom_device_info *cdi) {const struct cdrom_device_ops *cdo = cdi->ops;drivers/cdrom/gdrom.c +1
-1@@ -481,7 +481,7 @@ static int gdrom_bdops_open(struct block_device *bdev, fmode_t mode)bdev_check_media_change (bdev);mutex_lock (&gdrom_mutex); - ret =cdrom_open (gd.cd_info, mode); + ret =cdrom_open (gd.cd_info);mutex_unlock (&gdrom_mutex);return ret; }drivers/scsi/sr.c +1
-1@@ -512,7 +512,7 @@ static void sr_block_release(struct gendisk *disk, fmode_t mode)struct scsi_cd *cd =scsi_cd (disk);mutex_lock (&cd->lock); -cdrom_release (&cd->cdi, mode); +cdrom_release (&cd->cdi);mutex_unlock (&cd->lock);scsi_device_put (cd->device);include/linux/cdrom.h +1
-1@@ -102,7 +102,7 @@ int cdrom_read_tocentry(struct cdrom_device_info *cdi,/* the general block_device operations structure: */ int cdrom_open (struct cdrom_device_info *cdi,fmode_t mode); -extern void cdrom_release (struct cdrom_device_info *cdi,fmode_t mode); +void cdrom_release (struct cdrom_device_info *cdi);int cdrom_ioctl (struct cdrom_device_info *cdi,struct block_device *bdev,unsigned int cmd,unsigned long arg); extern unsigned int cdrom_check_events(struct cdrom_device_info *cdi,Signature · 6 lines
2.39.2 ______________________________________________________ Linux MTD discussion mailing list http://lists.infradead.org/mailman/listinfo/linux-mtd/
Christoph Hellwig
maintainerPATCH 7/31 block: pass a gendisk on bdev_check_media_change
In reply to Christoph Hellwigbdev_check_media_change should only ever be called for the whole device. Pass a gendisk to make that explicit and rename the function to disk_check_media_change.
--- block/disk-events.c | 18 +++++++++--------- drivers/block/amiflop.c | 2 +- drivers/block/ataflop.c | 6 +++--- drivers/block/floppy.c | 16 ++++++++-------- drivers/block/swim.c | 2 +- drivers/block/swim3.c | 2 +- drivers/cdrom/gdrom.c | 2 +- drivers/md/md.c | 2 +- drivers/scsi/sd.c | 9 ++++----- drivers/scsi/sr.c | 2 +- include/linux/blkdev.h | 2 +- 11 files changed, 31 insertions(+), 32 deletions(-)
block/disk-events.c +9 -9
@@ -263,31 +263,31 @@ static unsigned int disk_clear_events(struct gendisk *disk, unsigned int mask) }/** -* bdev_check_media_change - check if a removable media has been changed -* @bdev: block device to check +* disk_check_media_change - check if a removable media has been changed +* @disk: gendisk to check * * Check whether a removable media has been changed, and attempt to free all * dentries and inodes and invalidates all block device page cache entries in * that case. * -* Returns %true if the block device changed, or %false if not. +* Returns %true if the media has changed, or %false if not. */ -bool bdev_check_media_change (struct block_device *bdev) +bool disk_check_media_change (struct gendisk *disk) {unsigned int events; - events =disk_clear_events (bdev->bd_disk,DISK_EVENT_MEDIA_CHANGE | + events =disk_clear_events (disk,DISK_EVENT_MEDIA_CHANGE |DISK_EVENT_EJECT_REQUEST );if (!(events &DISK_EVENT_MEDIA_CHANGE ))return false; -if (__invalidate_device (bdev, true)) +if (__invalidate_device (disk->part0, true))pr_warn ("VFS: busy inodes on changed media %s\n" , - bdev->bd_disk->disk_name); -set_bit (GD_NEED_PART_SCAN , &bdev->bd_disk->state); + disk->disk_name); +set_bit (GD_NEED_PART_SCAN , &disk->state);return true; } -EXPORT_SYMBOL (bdev_check_media_change); +EXPORT_SYMBOL (disk_check_media_change);/** * disk_force_media_change - force a media change event
drivers/block/amiflop.c +1 -1
@@ -1675,7 +1675,7 @@ static int floppy_open(struct block_device *bdev, fmode_t mode) }if (mode & (FMODE_READ |FMODE_WRITE )) { -bdev_check_media_change (bdev); +disk_check_media_change (bdev->bd_disk);if (mode &FMODE_WRITE ) {int wrprot;
drivers/block/ataflop.c +3 -3
@@ -1760,8 +1760,8 @@ static int fd_locked_ioctl(struct block_device *bdev, fmode_t mode,/* invalidate the buffer track to force a reread */ BufferDrive =-1 ;set_bit (drive, &fake_change); -if (bdev_check_media_change (bdev)) -floppy_revalidate (bdev->bd_disk); +if (disk_check_media_change (disk)) +floppy_revalidate (disk);return 0 ;default :return -EINVAL ;
@@ -1938,7 +1938,7 @@ static int floppy_open(struct block_device *bdev, fmode_t mode)return 0 ;if (mode & (FMODE_READ |FMODE_WRITE )) { -if (bdev_check_media_change (bdev)) +if (disk_check_media_change (bdev->bd_disk))floppy_revalidate (bdev->bd_disk);if (mode &FMODE_WRITE ) {if (p->wpstat) {
drivers/block/floppy.c +8 -8
@@ -3210,13 +3210,13 @@ static int floppy_raw_cmd_ioctl(int type, int drive, int cmd,#endif -static int invalidate_drive (struct block_device *bdev) +static int invalidate_drive (struct gendisk *disk) {/* invalidate the buffer track to force a reread */ -set_bit ((long )bdev->bd_disk->private_data, &fake_change); +set_bit ((long )disk->private_data, &fake_change);process_fd_request (); -if (bdev_check_media_change (bdev)) -floppy_revalidate (bdev->bd_disk); +if (disk_check_media_change (disk)) +floppy_revalidate (disk);return 0 ; }
@@ -3287,7 +3287,7 @@ static int set_geometry(unsigned int cmd, struct floppy_struct *g, drive_state[current_drive].maxtrack || ((user_params[drive].sect ^ oldStretch) & (FD_SWAPSIDES | FD_SECTBASEMASK))) -invalidate_drive (bdev); +invalidate_drive (bdev->bd_disk); elseprocess_fd_request (); }
@@ -3464,7 +3464,7 @@ static int fd_locked_ioctl(struct block_device *bdev, fmode_t mode, unsigned int current_type[drive] =NULL ; floppy_sizes[drive] =MAX_DISK_SIZE <<1 ; drive_state[drive].keep_data =0 ; -return invalidate_drive (bdev); +return invalidate_drive (bdev->bd_disk);case FDSETPRM :case FDDEFPRM :return set_geometry (cmd, &inparam.g, drive, type, bdev);
@@ -3503,7 +3503,7 @@ static int fd_locked_ioctl(struct block_device *bdev, fmode_t mode, unsigned intcase FDFLUSH :if (lock_fdc (drive))return -EINTR ; -return invalidate_drive (bdev); +return invalidate_drive (bdev->bd_disk);case FDSETEMSGTRESH : drive_params[drive].max_errors.reporting = (unsigned short )(param &0x0f );return 0 ;
@@ -4054,7 +4054,7 @@ static int floppy_open(struct block_device *bdev, fmode_t mode) drive_state[drive].last_checked =0 ;clear_bit (FD_OPEN_SHOULD_FAIL_BIT , &drive_state[drive].flags); -if (bdev_check_media_change (bdev)) +if (disk_check_media_change (bdev->bd_disk))floppy_revalidate (bdev->bd_disk);if (test_bit (FD_DISK_CHANGED_BIT , &drive_state[drive].flags)) goto out;
drivers/block/swim.c +1 -1
@@ -640,7 +640,7 @@ static int floppy_open(struct block_device *bdev, fmode_t mode)return 0 ;if (mode & (FMODE_READ |FMODE_WRITE )) { -if (bdev_check_media_change (bdev) && fs->disk_in) +if (disk_check_media_change (bdev->bd_disk) && fs->disk_in) fs->ejected =0 ;if ((mode &FMODE_WRITE ) && fs->write_protected) { err = -EROFS ;
drivers/block/swim3.c +1 -1
@@ -963,7 +963,7 @@ static int floppy_open(struct block_device *bdev, fmode_t mode)if (err ==0 && (mode &FMODE_NDELAY ) ==0 && (mode & (FMODE_READ |FMODE_WRITE ))) { -if (bdev_check_media_change (bdev)) +if (disk_check_media_change (bdev->bd_disk))floppy_revalidate (bdev->bd_disk);if (fs->ejected) err = -ENXIO ;
drivers/cdrom/gdrom.c +1 -1
@@ -478,7 +478,7 @@ static int gdrom_bdops_open(struct block_device *bdev, fmode_t mode) {int ret; -bdev_check_media_change (bdev); +disk_check_media_change (bdev->bd_disk);mutex_lock (&gdrom_mutex); ret =cdrom_open (gd.cd_info);
drivers/md/md.c +1 -1
@@ -7789,7 +7789,7 @@ static int md_open(struct block_device *bdev, fmode_t mode)atomic_inc (&mddev->openers);mutex_unlock (&mddev->open_mutex); -bdev_check_media_change (bdev); +disk_check_media_change (bdev->bd_disk);return 0 ; out_unlock:
drivers/scsi/sd.c +4 -5
@@ -1280,11 +1280,10 @@ static void sd_uninit_command(struct scsi_cmnd *SCpnt)mempool_free (rq->special_vec.bv_page, sd_page_pool); } -static bool sd_need_revalidate (struct block_device *bdev, -struct scsi_disk *sdkp) +static bool sd_need_revalidate (struct gendisk *disk,struct scsi_disk *sdkp) {if (sdkp->device->removable || sdkp->write_prot) { -if (bdev_check_media_change (bdev)) +if (disk_check_media_change (disk))return true; }
@@ -1293,7 +1292,7 @@ static bool sd_need_revalidate(struct block_device *bdev,* nothing to do with partitions, BLKRRPART is used to force a full * revalidate after things like a format for historical reasons. */ -return test_bit (GD_NEED_PART_SCAN , &bdev->bd_disk->state); +return test_bit (GD_NEED_PART_SCAN , &disk->state); }/**
@@ -1330,7 +1329,7 @@ static int sd_open(struct block_device *bdev, fmode_t mode)if (!scsi_block_when_processing_errors (sdev)) goto error_out; -if (sd_need_revalidate (bdev, sdkp)) +if (sd_need_revalidate (bdev->bd_disk, sdkp))sd_revalidate_disk (bdev->bd_disk);/*
drivers/scsi/sr.c +1 -1
@@ -494,7 +494,7 @@ static int sr_block_open(struct block_device *bdev, fmode_t mode)return -ENXIO ;scsi_autopm_get_device (sdev); -if (bdev_check_media_change (bdev)) +if (disk_check_media_change (bdev->bd_disk))sr_revalidate_disk (cd);mutex_lock (&cd->lock);
include/linux/blkdev.h +1 -1
@@ -817,7 +817,7 @@ int __register_blkdev(unsigned int major, const char *name, __register_blkdev(major, name, NULL)void unregister_blkdev (unsigned int major,const char *name); -bool bdev_check_media_change (struct block_device *bdev); +bool disk_check_media_change (struct gendisk *disk);int __invalidate_device (struct block_device *bdev,bool kill_dirty);void set_capacity (struct gendisk *disk,sector_t size);
Signature · 1 line
2.39.2
Re: [PATCH 07/31] block: pass a gendisk on bdev_check_media_change
Quoted 6 lines · Christoph Hellwig
bdev_check_media_changeshould only ever be called for the whole device. Pass a gendisk to make that explicit and rename the function todisk_check_media_change.Signed-off-by Christoph Hellwig <[email protected]>---
Under the assumption it did only in fact ever only get called on the whole device so far,
Re: [PATCH 07/31] block: pass a gendisk on bdev_check_media_change
In reply to Christoph HellwigQuoted 5 lines · Christoph Hellwig
bdev_check_media_changeshould only ever be called for the whole device. Pass a gendisk to make that explicit and rename the function todisk_check_media_change.Signed-off-by Christoph Hellwig <[email protected]>
Quoted 14 lines
--- block/disk-events.c | 18 +++++++++--------- drivers/block/amiflop.c | 2 +- drivers/block/ataflop.c | 6 +++--- drivers/block/floppy.c | 16 ++++++++-------- drivers/block/swim.c | 2 +- drivers/block/swim3.c | 2 +- drivers/cdrom/gdrom.c | 2 +- drivers/md/md.c | 2 +- drivers/scsi/sd.c | 9 ++++----- drivers/scsi/sr.c | 2 +- include/linux/blkdev.h | 2 +- 11 files changed, 31 insertions(+), 32 deletions(-)
Cheers,
Hannes
Christoph Hellwig
maintainerPATCH 8/31 block: share code between disk_check_media_change and disk_force_media_change
In reply to Christoph HellwigFactor the common logic between disk_check_media_change and disk_force_media_change into a helper.
--- block/disk-events.c | 37 ++++++++++++++++--------------------- 1 file changed, 16 insertions(+), 21 deletions(-)
block/disk-events.c +16 -21
@@ -262,6 +262,18 @@ static unsigned int disk_clear_events(struct gendisk *disk, unsigned int mask)return pending; } +static bool __disk_check_media_change (struct gendisk *disk,unsigned int events) +{ +if (!(events &DISK_EVENT_MEDIA_CHANGE )) +return false; + +if (__invalidate_device (disk->part0, true)) +pr_warn ("VFS: busy inodes on changed media %s\n" , + disk->disk_name); +set_bit (GD_NEED_PART_SCAN , &disk->state); +return true; +} +/** * disk_check_media_change - check if a removable media has been changed * @disk: gendisk to check
@@ -274,18 +286,9 @@ static unsigned int disk_clear_events(struct gendisk *disk, unsigned int mask)*/ bool disk_check_media_change (struct gendisk *disk) { -unsigned int events; - - events =disk_clear_events (disk,DISK_EVENT_MEDIA_CHANGE | -DISK_EVENT_EJECT_REQUEST ); -if (!(events &DISK_EVENT_MEDIA_CHANGE )) -return false; - -if (__invalidate_device (disk->part0, true)) -pr_warn ("VFS: busy inodes on changed media %s\n" , - disk->disk_name); -set_bit (GD_NEED_PART_SCAN , &disk->state); -return true; +return __disk_check_media_change (disk, +disk_clear_events (disk,DISK_EVENT_MEDIA_CHANGE | +DISK_EVENT_EJECT_REQUEST )); }EXPORT_SYMBOL (disk_check_media_change);
@@ -303,15 +306,7 @@ EXPORT_SYMBOL(disk_check_media_change);bool disk_force_media_change (struct gendisk *disk,unsigned int events) {disk_event_uevent (disk, events); - -if (!(events &DISK_EVENT_MEDIA_CHANGE )) -return false; - -if (__invalidate_device (disk->part0, true)) -pr_warn ("VFS: busy inodes on changed media %s\n" , - disk->disk_name); -set_bit (GD_NEED_PART_SCAN , &disk->state); -return true; +return __disk_check_media_change (disk, events); }EXPORT_SYMBOL_GPL (disk_force_media_change);
Signature · 1 line
2.39.2
Re: [PATCH 08/31] block: share code between disk_check_media_change and disk_force_media_change
Quoted 5 lines · Christoph Hellwig
Factor the common logic between
disk_check_media_changeanddisk_force_media_changeinto a helper.Signed-off-by Christoph Hellwig <[email protected]>---
Looks good to me,
Re: [PATCH 08/31] block: share code between disk_check_media_change and disk_force_media_change
In reply to Christoph HellwigQuoted 40 lines · Christoph Hellwig
Factor the common logic between
disk_check_media_changeanddisk_force_media_changeinto a helper.Signed-off-by Christoph Hellwig <[email protected]>--- block/disk-events.c | 37 ++++++++++++++++--------------------- 1 file changed, 16 insertions(+), 21 deletions(-)block/disk-events.c +12
-5@@ -262,6 +262,18 @@ static unsigned int disk_clear_events(struct gendisk *disk, unsigned int mask)return pending; } +static bool __disk_check_media_change (struct gendisk *disk,unsigned int events) +{ +if (!(events &DISK_EVENT_MEDIA_CHANGE )) +return false; + +if (__invalidate_device (disk->part0, true)) +pr_warn ("VFS: busy inodes on changed media %s\n" , + disk->disk_name); +set_bit (GD_NEED_PART_SCAN , &disk->state); +return true; +} +/** * disk_check_media_change - check if a removable media has been changed * @disk: gendisk to check @@ -274,18 +286,9 @@ static unsigned int disk_clear_events(struct gendisk *disk, unsigned int mask)*/ bool disk_check_media_change (struct gendisk *disk) { -unsigned int events; - - events =disk_clear_events (disk,DISK_EVENT_MEDIA_CHANGE | -DISK_EVENT_EJECT_REQUEST ); -if (!(events &DISK_EVENT_MEDIA_CHANGE ))
block/disk-events.c static unsigned int disk_clear_events(struct gendisk *disk, unsigned int mask) · line 291
Quoted 10 lines
block/disk-events.c +3
-7-return false; - -if (__invalidate_device (disk->part0, true)) -pr_warn ("VFS: busy inodes on changed media %s\n" , - disk->disk_name); -set_bit (GD_NEED_PART_SCAN , &disk->state); -return true; +return __disk_check_media_change (disk, +disk_clear_events (disk,DISK_EVENT_MEDIA_CHANGE | +DISK_EVENT_EJECT_REQUEST ));
Can you move the call to disk_clear_events() out of the call to __disk_check_media_change()? I find this pattern hard to read.
Cheers,
Hannes
Christoph Hellwig
maintainerRe: [PATCH 08/31] block: share code between disk_check_media_change and disk_force_media_change
Quoted 8 lines · Hannes Reinecke
block/disk-events.c static unsigned int disk_clear_events(struct gendisk *disk, unsigned int mask) · line 291
Quoted 4 lines
block/disk-events.c +3
-1-return true; +return __disk_check_media_change (disk, +disk_clear_events (disk,DISK_EVENT_MEDIA_CHANGE | +DISK_EVENT_EJECT_REQUEST ));Can you move the call to
disk_clear_events()out of the call to__disk_check_media_change()?
I find this pattern hard to read.
I suspect you've not done enough functional programming in your youth :)
Hannes Reinecke
Reviewed-byRe: [PATCH 08/31] block: share code between disk_check_media_change and disk_force_media_change
Quoted 11 lines · Christoph Hellwig
Quoted 8 lines · Hannes Reinecke
block/disk-events.c static unsigned int disk_clear_events(struct gendisk *disk, unsigned int mask) · line 291
Quoted 4 lines
block/disk-events.c +3
-1-return true; +return __disk_check_media_change (disk, +disk_clear_events (disk,DISK_EVENT_MEDIA_CHANGE | +DISK_EVENT_EJECT_REQUEST ));Can you move the call to
disk_clear_events()out of the call to__disk_check_media_change()?
I find this pattern hard to read.I suspect you've not done enough functional programming in your youth :)
That's why I said 'I find'; purely personal preference. If you're happy with:
Cheers,
Hannes
(In my youth? One is tempted to quote Falco: "If you remember the '90s you haven't experienced them...")
Christoph Hellwig
maintainerPATCH 9/31 block: pass a gendisk to ->open
In reply to Christoph Hellwig->open is only called on the whole device. Make that explicit by passing a gendisk instead of the block_device.
--- arch/um/drivers/ubd_kern.c | 5 ++--- arch/xtensa/platforms/iss/simdisk.c | 4 ++-- block/bdev.c | 2 +- drivers/block/amiflop.c | 8 ++++---- drivers/block/aoe/aoeblk.c | 4 ++-- drivers/block/ataflop.c | 16 +++++++-------- drivers/block/drbd/drbd_main.c | 6 +++--- drivers/block/floppy.c | 30 +++++++++++++++-------------- drivers/block/nbd.c | 8 ++++---- drivers/block/pktcdvd.c | 6 +++--- drivers/block/rbd.c | 4 ++-- drivers/block/rnbd/rnbd-clt.c | 4 ++-- drivers/block/swim.c | 10 +++++----- drivers/block/swim3.c | 10 +++++----- drivers/block/ublk_drv.c | 4 ++-- drivers/block/z2ram.c | 6 ++---- drivers/block/zram/zram_drv.c | 13 +++++-------- drivers/cdrom/gdrom.c | 4 ++-- drivers/md/bcache/super.c | 4 ++-- drivers/md/dm.c | 4 ++-- drivers/md/md.c | 6 +++--- drivers/mmc/core/block.c | 4 ++-- drivers/mtd/mtd_blkdevs.c | 4 ++-- drivers/mtd/ubi/block.c | 4 ++-- drivers/nvme/host/core.c | 4 ++-- drivers/nvme/host/multipath.c | 4 ++-- drivers/s390/block/dasd.c | 4 ++-- drivers/s390/block/dcssblk.c | 7 +++---- drivers/scsi/sd.c | 12 ++++++------ drivers/scsi/sr.c | 6 +++--- include/linux/blkdev.h | 2 +- 31 files changed, 102 insertions(+), 107 deletions(-)
arch/um/drivers/ubd_kern.c +2 -3
@@ -108,7 +108,7 @@ static inline void ubd_set_bit(__u64 bit, unsigned char *data)static DEFINE_MUTEX (ubd_lock);static DEFINE_MUTEX (ubd_mutex);/* replaces BKL, might not be needed */ -static int ubd_open (struct block_device *bdev,fmode_t mode); +static int ubd_open (struct gendisk *disk,fmode_t mode);static void ubd_release (struct gendisk *disk,fmode_t mode);static int ubd_ioctl (struct block_device *bdev,fmode_t mode,unsigned int cmd,unsigned long arg);
@@ -1154,9 +1154,8 @@ static int __init ubd_driver_init(void){device_initcall (ubd_driver_init); -static int ubd_open (struct block_device *bdev,fmode_t mode) +static int ubd_open (struct gendisk *disk,fmode_t mode) { -struct gendisk *disk = bdev->bd_disk;struct ubd *ubd_dev = disk->private_data;int err =0 ;
arch/xtensa/platforms/iss/simdisk.c +2 -2
@@ -120,9 +120,9 @@ static void simdisk_submit_bio(struct bio *bio)bio_endio (bio); } -static int simdisk_open (struct block_device *bdev,fmode_t mode) +static int simdisk_open (struct gendisk *disk,fmode_t mode) { -struct simdisk *dev = bdev->bd_disk->private_data; +struct simdisk *dev = disk->private_data;spin_lock (&dev->lock); ++dev->users;
block/bdev.c +1 -1
@@ -652,7 +652,7 @@ static int blkdev_get_whole(struct block_device *bdev, fmode_t mode)int ret;if (disk->fops->open) { - ret = disk->fops->open (bdev, mode); + ret = disk->fops->open (disk, mode);if (ret) {/* avoid ghost partitions on a removed medium */ if (ret == -ENOMEDIUM &&
drivers/block/amiflop.c +4 -4
@@ -1654,10 +1654,10 @@ static void fd_probe(int dev)* /dev/PS0 etc), and disallows simultaneous access to the same * drive with different device numbers. */ -static int floppy_open (struct block_device *bdev,fmode_t mode) +static int floppy_open (struct gendisk *disk,fmode_t mode) { -int drive =MINOR (bdev->bd_dev) &3 ; -int system = (MINOR (bdev->bd_dev) &4 ) >>2 ; +int drive = disk->first_minor &3 ; +int system = (disk->first_minor &4 ) >>2 ;int old_dev;unsigned long flags;
@@ -1675,7 +1675,7 @@ static int floppy_open(struct block_device *bdev, fmode_t mode) }if (mode & (FMODE_READ |FMODE_WRITE )) { -disk_check_media_change (bdev->bd_disk); +disk_check_media_change (disk);if (mode &FMODE_WRITE ) {int wrprot;
drivers/block/aoe/aoeblk.c +2 -2
@@ -204,9 +204,9 @@ aoedisk_rm_debugfs(struct aoedev *d) }static int -aoeblk_open (struct block_device *bdev,fmode_t mode) +aoeblk_open (struct gendisk *disk,fmode_t mode) { -struct aoedev *d = bdev->bd_disk->private_data; +struct aoedev *d = disk->private_data;ulong flags;if (!virt_addr_valid (d)) {
drivers/block/ataflop.c +8 -8
@@ -447,7 +447,7 @@ static int fd_locked_ioctl(struct block_device *bdev, fmode_t mode, unsigned intstatic void fd_probe (int drive );static int fd_test_drive_present (int drive );static void config_types (void ); -static int floppy_open (struct block_device *bdev,fmode_t mode); +static int floppy_open (struct gendisk *disk,fmode_t mode);static void floppy_release (struct gendisk *disk,fmode_t mode);/************************* End of Prototypes **************************/
@@ -1915,10 +1915,10 @@ static void __init config_types( void )* drive with different device numbers. */ -static int floppy_open (struct block_device *bdev,fmode_t mode) +static int floppy_open (struct gendisk *disk,fmode_t mode) { -struct atari_floppy_struct *p = bdev->bd_disk->private_data; -int type =MINOR (bdev->bd_dev) >>2 ; +struct atari_floppy_struct *p = disk->private_data; +int type = disk->first_minor >>2 ;DPRINT (("fd_open: type=%d\n" ,type));if (p->ref && p->type != type)
@@ -1938,8 +1938,8 @@ static int floppy_open(struct block_device *bdev, fmode_t mode)return 0 ;if (mode & (FMODE_READ |FMODE_WRITE )) { -if (disk_check_media_change (bdev->bd_disk)) -floppy_revalidate (bdev->bd_disk); +if (disk_check_media_change (disk)) +floppy_revalidate (disk);if (mode &FMODE_WRITE ) {if (p->wpstat) {if (p->ref <0 )
@@ -1953,12 +1953,12 @@ static int floppy_open(struct block_device *bdev, fmode_t mode)return 0 ; } -static int floppy_unlocked_open (struct block_device *bdev,fmode_t mode) +static int floppy_unlocked_open (struct gendisk *disk,fmode_t mode) {int ret;mutex_lock (&ataflop_mutex); - ret =floppy_open (bdev, mode); + ret =floppy_open (disk, mode);mutex_unlock (&ataflop_mutex);return ret;
drivers/block/drbd/drbd_main.c +3 -3
@@ -49,7 +49,7 @@#include "drbd_debugfs.h" static DEFINE_MUTEX (drbd_main_mutex); -static int drbd_open (struct block_device *bdev,fmode_t mode); +static int drbd_open (struct gendisk *disk,fmode_t mode);static void drbd_release (struct gendisk *gd,fmode_t mode);static void md_sync_timer_fn (struct timer_list *t);static int w_bitmap_io (struct drbd_work *w,int unused);
@@ -1882,9 +1882,9 @@ int drbd_send_all(struct drbd_connection *connection, struct socket *sock, voidreturn 0 ; } -static int drbd_open (struct block_device *bdev,fmode_t mode) +static int drbd_open (struct gendisk *disk,fmode_t mode) { -struct drbd_device *device = bdev->bd_disk->private_data; +struct drbd_device *device = disk->private_data;unsigned long flags;int rv =0 ;
drivers/block/floppy.c +16 -14
@@ -402,7 +402,7 @@ static struct floppy_drive_struct drive_state[N_DRIVE];static struct floppy_write_errors write_errors[N_DRIVE ];static struct timer_list motor_off_timer[N_DRIVE ];static struct blk_mq_tag_set tag_sets[N_DRIVE ]; -static struct block_device *opened_bdev[N_DRIVE ]; +static struct gendisk *opened_disk[N_DRIVE ];static DEFINE_MUTEX (open_lock);static struct floppy_raw_cmd *raw_cmd, default_raw_cmd;
@@ -3251,10 +3251,11 @@ static int set_geometry(unsigned int cmd, struct floppy_struct *g, floppy_type[type].size +1 ;process_fd_request ();for (cnt =0 ; cnt <N_DRIVE ; cnt++) { -struct block_device *bdev = opened_bdev[cnt]; -if (!bdev ||ITYPE (drive_state[cnt].fd_device) != type) +struct gendisk *disk = opened_disk[cnt]; + +if (!disk ||ITYPE (drive_state[cnt].fd_device) != type)continue ; -__invalidate_device (bdev, true); +__invalidate_device (disk->part0, true); }mutex_unlock (&open_lock); }else {
@@ -3973,7 +3974,7 @@ static void floppy_release(struct gendisk *disk, fmode_t mode) drive_state[drive].fd_ref =0 ; }if (!drive_state[drive].fd_ref) - opened_bdev[drive] =NULL ; + opened_disk[drive] =NULL ;mutex_unlock (&open_lock);mutex_unlock (&floppy_mutex); }
@@ -3983,9 +3984,9 @@ static void floppy_release(struct gendisk *disk, fmode_t mode)* /dev/PS0 etc), and disallows simultaneous access to the same * drive with different device numbers. */ -static int floppy_open (struct block_device *bdev,fmode_t mode) +static int floppy_open (struct gendisk *disk,fmode_t mode) { -int drive = (long )bdev->bd_disk->private_data; +int drive = (long )disk->private_data;int old_dev, new_dev;int try;int res = -EBUSY ;
@@ -3994,7 +3995,7 @@ static int floppy_open(struct block_device *bdev, fmode_t mode)mutex_lock (&floppy_mutex);mutex_lock (&open_lock); old_dev = drive_state[drive].fd_device; -if (opened_bdev[drive] && opened_bdev[drive] != bdev) +if (opened_disk[drive] && opened_disk[drive] != disk) goto out2;if (!drive_state[drive].fd_ref && (drive_params[drive].flags &FD_BROKEN_DCL )) {
@@ -4004,7 +4005,7 @@ static int floppy_open(struct block_device *bdev, fmode_t mode) drive_state[drive].fd_ref++; - opened_bdev[drive] = bdev; + opened_disk[drive] = disk; res = -ENXIO ;
@@ -4038,7 +4039,7 @@ static int floppy_open(struct block_device *bdev, fmode_t mode) } } - new_dev =MINOR (bdev->bd_dev); + new_dev = disk->first_minor; drive_state[drive].fd_device = new_dev;set_capacity (disks[drive][ITYPE (new_dev)], floppy_sizes[new_dev]);if (old_dev !=-1 && old_dev != new_dev) {
@@ -4054,8 +4055,8 @@ static int floppy_open(struct block_device *bdev, fmode_t mode) drive_state[drive].last_checked =0 ;clear_bit (FD_OPEN_SHOULD_FAIL_BIT , &drive_state[drive].flags); -if (disk_check_media_change (bdev->bd_disk)) -floppy_revalidate (bdev->bd_disk); +if (disk_check_media_change (disk)) +floppy_revalidate (disk);if (test_bit (FD_DISK_CHANGED_BIT , &drive_state[drive].flags)) goto out;if (test_bit (FD_OPEN_SHOULD_FAIL_BIT , &drive_state[drive].flags))
@@ -4073,7 +4074,7 @@ static int floppy_open(struct block_device *bdev, fmode_t mode) drive_state[drive].fd_ref--;if (!drive_state[drive].fd_ref) - opened_bdev[drive] =NULL ; + opened_disk[drive] =NULL ; out2:mutex_unlock (&open_lock);mutex_unlock (&floppy_mutex);
@@ -4203,7 +4204,8 @@ static int floppy_revalidate(struct gendisk *disk) drive_state[drive].generation++;if (drive_no_geom (drive)) {/* auto-sensing */ - res =__floppy_read_block_0 (opened_bdev[drive], drive); + res =__floppy_read_block_0 (opened_disk[drive]->part0, + drive); }else {if (cf)poll_drive (false,FD_RAW_NEED_DISK );
drivers/block/nbd.c +4 -4
@@ -1553,13 +1553,13 @@ static struct nbd_config *nbd_alloc_config(void)return config; } -static int nbd_open (struct block_device *bdev,fmode_t mode) +static int nbd_open (struct gendisk *disk,fmode_t mode) {struct nbd_device *nbd;int ret =0 ;mutex_lock (&nbd_index_mutex); - nbd = bdev->bd_disk->private_data; + nbd = disk->private_data;if (!nbd) { ret = -ENXIO ; goto out;
@@ -1587,10 +1587,10 @@ static int nbd_open(struct block_device *bdev, fmode_t mode)refcount_inc (&nbd->refs);mutex_unlock (&nbd->config_lock);if (max_part) -set_bit (GD_NEED_PART_SCAN , &bdev->bd_disk->state); +set_bit (GD_NEED_PART_SCAN , &disk->state); }else if (nbd_disconnected (nbd->config)) {if (max_part) -set_bit (GD_NEED_PART_SCAN , &bdev->bd_disk->state); +set_bit (GD_NEED_PART_SCAN , &disk->state); } out:mutex_unlock (&nbd_index_mutex);
drivers/block/pktcdvd.c +3 -3
@@ -2204,14 +2204,14 @@ static struct pktcdvd_device *pkt_find_dev_from_minor(unsigned int dev_minor)return pkt_devs[dev_minor]; } -static int pkt_open (struct block_device *bdev,fmode_t mode) +static int pkt_open (struct gendisk *disk,fmode_t mode) {struct pktcdvd_device *pd =NULL ;int ret;mutex_lock (&pktcdvd_mutex);mutex_lock (&ctl_mutex); - pd =pkt_find_dev_from_minor (MINOR (bdev->bd_dev)); + pd =pkt_find_dev_from_minor (disk->first_minor);if (!pd) { ret = -ENODEV ; goto out;
@@ -2233,7 +2233,7 @@ static int pkt_open(struct block_device *bdev, fmode_t mode)* needed here as well, since ext2 (among others) may change * the blocksize at mount time */ -set_blocksize (bdev,CD_FRAMESIZE ); +set_blocksize (disk->part0,CD_FRAMESIZE ); }mutex_unlock (&ctl_mutex);
drivers/block/rbd.c +2 -2
@@ -660,9 +660,9 @@ static bool pending_result_dec(struct pending_result *pending, int *result)return true; } -static int rbd_open (struct block_device *bdev,fmode_t mode) +static int rbd_open (struct gendisk *disk,fmode_t mode) { -struct rbd_device *rbd_dev = bdev->bd_disk->private_data; +struct rbd_device *rbd_dev = disk->private_data;bool removing = false;spin_lock_irq (&rbd_dev->lock);
drivers/block/rnbd/rnbd-clt.c +2 -2
@@ -921,9 +921,9 @@ rnbd_clt_session *find_or_create_sess(const char *sessname, bool *first)return sess; } -static int rnbd_client_open (struct block_device *block_device,fmode_t mode) +static int rnbd_client_open (struct gendisk *disk,fmode_t mode) { -struct rnbd_clt_dev *dev = block_device->bd_disk->private_data; +struct rnbd_clt_dev *dev = disk->private_data;if (get_disk_ro (dev->gd) && (mode &FMODE_WRITE ))return -EPERM ;
drivers/block/swim.c +5 -5
@@ -608,9 +608,9 @@ static void setup_medium(struct floppy_state *fs) } } -static int floppy_open (struct block_device *bdev,fmode_t mode) +static int floppy_open (struct gendisk *disk,fmode_t mode) { -struct floppy_state *fs = bdev->bd_disk->private_data; +struct floppy_state *fs = disk->private_data;struct swim __iomem *base = fs->swd->base;int err;
@@ -640,7 +640,7 @@ static int floppy_open(struct block_device *bdev, fmode_t mode)return 0 ;if (mode & (FMODE_READ |FMODE_WRITE )) { -if (disk_check_media_change (bdev->bd_disk) && fs->disk_in) +if (disk_check_media_change (disk) && fs->disk_in) fs->ejected =0 ;if ((mode &FMODE_WRITE ) && fs->write_protected) { err = -EROFS ;
@@ -659,12 +659,12 @@ static int floppy_open(struct block_device *bdev, fmode_t mode)return err; } -static int floppy_unlocked_open (struct block_device *bdev,fmode_t mode) +static int floppy_unlocked_open (struct gendisk *disk,fmode_t mode) {int ret;mutex_lock (&swim_mutex); - ret =floppy_open (bdev, mode); + ret =floppy_open (disk, mode);mutex_unlock (&swim_mutex);return ret;
drivers/block/swim3.c +5 -5
@@ -248,7 +248,7 @@ static void release_drive(struct floppy_state *fs);static int fd_eject (struct floppy_state *fs);static int floppy_ioctl (struct block_device *bdev,fmode_t mode,unsigned int cmd,unsigned long param); -static int floppy_open (struct block_device *bdev,fmode_t mode); +static int floppy_open (struct gendisk *disk,fmode_t mode);static void floppy_release (struct gendisk *disk,fmode_t mode);static unsigned int floppy_check_events (struct gendisk *disk,unsigned int clearing);
@@ -923,9 +923,9 @@ static int floppy_ioctl(struct block_device *bdev, fmode_t mode,return ret; } -static int floppy_open (struct block_device *bdev,fmode_t mode) +static int floppy_open (struct gendisk *disk,fmode_t mode) { -struct floppy_state *fs = bdev->bd_disk->private_data; +struct floppy_state *fs = disk->private_data;struct swim3 __iomem *sw = fs->swim3;int n, err =0 ;
@@ -963,8 +963,8 @@ static int floppy_open(struct block_device *bdev, fmode_t mode)if (err ==0 && (mode &FMODE_NDELAY ) ==0 && (mode & (FMODE_READ |FMODE_WRITE ))) { -if (disk_check_media_change (bdev->bd_disk)) -floppy_revalidate (bdev->bd_disk); +if (disk_check_media_change (disk)) +floppy_revalidate (disk);if (fs->ejected) err = -ENXIO ; }
drivers/block/ublk_drv.c +2 -2
@@ -447,9 +447,9 @@ static void ublk_store_owner_uid_gid(unsigned int *owner_uid, *owner_gid =from_kgid (&init_user_ns, gid); } -static int ublk_open (struct block_device *bdev,fmode_t mode) +static int ublk_open (struct gendisk *disk,fmode_t mode) { -struct ublk_device *ub = bdev->bd_disk->private_data; +struct ublk_device *ub = disk->private_data;if (capable (CAP_SYS_ADMIN ))return 0 ;
drivers/block/z2ram.c +2 -4
@@ -140,16 +140,14 @@ static void get_chipram(void)return ; } -static int z2_open (struct block_device *bdev,fmode_t mode) +static int z2_open (struct gendisk *disk,fmode_t mode) { -int device; +int device = disk->first_minor;int max_z2_map = (Z2RAM_SIZE /Z2RAM_CHUNKSIZE ) *sizeof (z2ram_map[0 ]);int max_chip_map = (amiga_chip_size /Z2RAM_CHUNKSIZE ) *sizeof (z2ram_map[0 ]);int rc = -ENOMEM ; - device =MINOR (bdev->bd_dev); -mutex_lock (&z2ram_mutex);if (current_device !=-1 && current_device != device) { rc = -EBUSY ;
drivers/block/zram/zram_drv.c +5 -8
@@ -2097,19 +2097,16 @@ static ssize_t reset_store(struct device *dev,return len; } -static int zram_open (struct block_device *bdev,fmode_t mode) +static int zram_open (struct gendisk *disk,fmode_t mode) { -int ret =0 ; -struct zram *zram; +struct zram *zram = disk->private_data; -WARN_ON (!mutex_is_locked (&bdev->bd_disk->open_mutex)); +WARN_ON (!mutex_is_locked (&disk->open_mutex)); - zram = bdev->bd_disk->private_data;/* zram was claimed to reset so open request fails */ if (zram->claim) - ret = -EBUSY ; - -return ret; +return -EBUSY ; +return 0 ; }static const struct block_device_operations zram_devops = {
drivers/cdrom/gdrom.c +2 -2
@@ -474,11 +474,11 @@ static const struct cdrom_device_ops gdrom_ops = { CDC_RESET | CDC_DRIVE_STATUS | CDC_CD_R, }; -static int gdrom_bdops_open (struct block_device *bdev,fmode_t mode) +static int gdrom_bdops_open (struct gendisk *disk,fmode_t mode) {int ret; -disk_check_media_change (bdev->bd_disk); +disk_check_media_change (disk);mutex_lock (&gdrom_mutex); ret =cdrom_open (gd.cd_info);
drivers/md/bcache/super.c +2 -2
@@ -732,9 +732,9 @@ static int prio_read(struct cache *ca, uint64_t bucket)/* Bcache device */ -static int open_dev (struct block_device *b,fmode_t mode) +static int open_dev (struct gendisk *disk,fmode_t mode) { -struct bcache_device *d = b->bd_disk->private_data; +struct bcache_device *d = disk->private_data;if (test_bit (BCACHE_DEV_CLOSING , &d->flags))return -ENXIO ;
drivers/md/dm.c +2 -2
@@ -310,13 +310,13 @@ int dm_deleting_md(struct mapped_device *md)return test_bit (DMF_DELETING , &md->flags); } -static int dm_blk_open (struct block_device *bdev,fmode_t mode) +static int dm_blk_open (struct gendisk *disk,fmode_t mode) {struct mapped_device *md;spin_lock (&_minor_lock); - md = bdev->bd_disk->private_data; + md = disk->private_data;if (!md) goto out;
drivers/md/md.c +3 -3
@@ -7767,13 +7767,13 @@ static int md_set_read_only(struct block_device *bdev, bool ro)return err; } -static int md_open (struct block_device *bdev,fmode_t mode) +static int md_open (struct gendisk *disk,fmode_t mode) {struct mddev *mddev;int err;spin_lock (&all_mddevs_lock); - mddev =mddev_get (bdev->bd_disk->private_data); + mddev =mddev_get (disk->private_data);spin_unlock (&all_mddevs_lock);if (!mddev)return -ENODEV ;
@@ -7789,7 +7789,7 @@ static int md_open(struct block_device *bdev, fmode_t mode)atomic_inc (&mddev->openers);mutex_unlock (&mddev->open_mutex); -disk_check_media_change (bdev->bd_disk); +disk_check_media_change (disk);return 0 ; out_unlock:
drivers/mmc/core/block.c +2 -2
@@ -357,9 +357,9 @@ static const struct attribute_group *mmc_disk_attr_groups[] = { NULL, }; -static int mmc_blk_open (struct block_device *bdev,fmode_t mode) +static int mmc_blk_open (struct gendisk *disk,fmode_t mode) { -struct mmc_blk_data *md =mmc_blk_get (bdev->bd_disk); +struct mmc_blk_data *md =mmc_blk_get (disk);int ret = -ENXIO ;mutex_lock (&block_mutex);
drivers/mtd/mtd_blkdevs.c +2 -2
@@ -182,9 +182,9 @@ static blk_status_t mtd_queue_rq(struct blk_mq_hw_ctx *hctx,return BLK_STS_OK ; } -static int blktrans_open (struct block_device *bdev,fmode_t mode) +static int blktrans_open (struct gendisk *disk,fmode_t mode) { -struct mtd_blktrans_dev *dev = bdev->bd_disk->private_data; +struct mtd_blktrans_dev *dev = disk->private_data;int ret =0 ;kref_get (&dev->ref);
drivers/mtd/ubi/block.c +2 -2
@@ -227,9 +227,9 @@ static blk_status_t ubiblock_read(struct request *req)return BLK_STS_OK ; } -static int ubiblock_open (struct block_device *bdev,fmode_t mode) +static int ubiblock_open (struct gendisk *disk,fmode_t mode) { -struct ubiblock *dev = bdev->bd_disk->private_data; +struct ubiblock *dev = disk->private_data;int ret;mutex_lock (&dev->dev_mutex);
drivers/nvme/host/core.c +2 -2
@@ -1591,9 +1591,9 @@ static void nvme_ns_release(struct nvme_ns *ns)nvme_put_ns (ns); } -static int nvme_open (struct block_device *bdev,fmode_t mode) +static int nvme_open (struct gendisk *disk,fmode_t mode) { -return nvme_ns_open (bdev->bd_disk->private_data); +return nvme_ns_open (disk->private_data); }static void nvme_release (struct gendisk *disk,fmode_t mode)
drivers/nvme/host/multipath.c +2 -2
@@ -402,9 +402,9 @@ static void nvme_ns_head_submit_bio(struct bio *bio)srcu_read_unlock (&head->srcu, srcu_idx); } -static int nvme_ns_head_open (struct block_device *bdev,fmode_t mode) +static int nvme_ns_head_open (struct gendisk *disk,fmode_t mode) { -if (!nvme_tryget_ns_head (bdev->bd_disk->private_data)) +if (!nvme_tryget_ns_head (disk->private_data))return -ENXIO ;return 0 ; }
drivers/s390/block/dasd.c +2 -2
@@ -3234,12 +3234,12 @@ struct blk_mq_ops dasd_mq_ops = { .exit_hctx = dasd_exit_hctx, }; -static int dasd_open (struct block_device *bdev,fmode_t mode) +static int dasd_open (struct gendisk *disk,fmode_t mode) {struct dasd_device *base;int rc; - base =dasd_device_from_gendisk (bdev->bd_disk); + base =dasd_device_from_gendisk (disk);if (!base)return -ENODEV ;
drivers/s390/block/dcssblk.c +3 -4
@@ -28,7 +28,7 @@#define DCSSBLK_PARM_LEN 400#define DCSS_BUS_ID_SIZE 20 -static int dcssblk_open (struct block_device *bdev,fmode_t mode); +static int dcssblk_open (struct gendisk *disk,fmode_t mode);static void dcssblk_release (struct gendisk *disk,fmode_t mode);static void dcssblk_submit_bio (struct bio *bio); static long dcssblk_dax_direct_access(struct dax_device *dax_dev, pgoff_t pgoff,
@@ -809,12 +809,11 @@ dcssblk_remove_store(struct device *dev, struct device_attribute *attr, const ch }static int -dcssblk_open (struct block_device *bdev,fmode_t mode) +dcssblk_open (struct gendisk *disk,fmode_t mode) { -struct dcssblk_dev_info *dev_info; +struct dcssblk_dev_info *dev_info = disk->private_data;int rc; - dev_info = bdev->bd_disk->private_data;if (NULL == dev_info) { rc = -ENODEV ; goto out;
drivers/scsi/sd.c +6 -6
@@ -1297,7 +1297,7 @@ static bool sd_need_revalidate(struct gendisk *disk, struct scsi_disk *sdkp)/** * sd_open - open a scsi disk device -* @bdev: Block device of the scsi disk to open +* @disk: disk to open * @mode: FMODE_* mask * * Returns 0 if successful. Returns a negated errno value in case
@@ -1308,11 +1308,11 @@ static bool sd_need_revalidate(struct gendisk *disk, struct scsi_disk *sdkp)* In the latter case @inode and @filp carry an abridged amount * of information as noted above. * -* Locking: called with bdev->bd_disk->open_mutex held. +* Locking: called with disk->open_mutex held. **/ -static int sd_open (struct block_device *bdev,fmode_t mode) +static int sd_open (struct gendisk *disk,fmode_t mode) { -struct scsi_disk *sdkp =scsi_disk (bdev->bd_disk); +struct scsi_disk *sdkp =scsi_disk (disk);struct scsi_device *sdev = sdkp->device;int retval;
@@ -1329,8 +1329,8 @@ static int sd_open(struct block_device *bdev, fmode_t mode)if (!scsi_block_when_processing_errors (sdev)) goto error_out; -if (sd_need_revalidate (bdev->bd_disk, sdkp)) -sd_revalidate_disk (bdev->bd_disk); +if (sd_need_revalidate (disk, sdkp)) +sd_revalidate_disk (disk);/* * If the drive is empty, just let the open fail.
drivers/scsi/sr.c +3 -3
@@ -484,9 +484,9 @@ static void sr_revalidate_disk(struct scsi_cd *cd)get_sectorsize (cd); } -static int sr_block_open (struct block_device *bdev,fmode_t mode) +static int sr_block_open (struct gendisk *disk,fmode_t mode) { -struct scsi_cd *cd =scsi_cd (bdev->bd_disk); +struct scsi_cd *cd =scsi_cd (disk);struct scsi_device *sdev = cd->device;int ret;
@@ -494,7 +494,7 @@ static int sr_block_open(struct block_device *bdev, fmode_t mode)return -ENXIO ;scsi_autopm_get_device (sdev); -if (disk_check_media_change (bdev->bd_disk)) +if (disk_check_media_change (disk))sr_revalidate_disk (cd);mutex_lock (&cd->lock);
include/linux/blkdev.h +1 -1
@@ -1386,7 +1386,7 @@ struct block_device_operations {void (*submit_bio)(struct bio *bio);int (*poll_bio)(struct bio *bio,struct io_comp_batch *iob,unsigned int flags); -int (*open) (struct block_device *,fmode_t ); +int (*open)(struct gendisk *disk,fmode_t mode);void (*release) (struct gendisk *,fmode_t );int (*ioctl) (struct block_device *,fmode_t ,unsigned ,unsigned long );int (*compat_ioctl) (struct block_device *,fmode_t ,unsigned ,unsigned long );
Signature · 1 line
2.39.2
Re: [PATCH 09/31] block: pass a gendisk to ->open
Quoted 1 line · Christoph Hellwig
->open is only called on the whole device. Make that explicit by
Ok, that answers my question in
https://lore.kernel.org/all/20230607-chefsessel-angeordnet-269f0596f9b3@brauner
Quoted 10 lines
passing a gendisk instead of the
block_device.Signed-off-by Christoph Hellwig <[email protected]>---
include/linux/blkdev.h +0
-0
include/linux/blkdev.h struct block_device_operations { · line 1392
Quoted 8 lines
include/linux/blkdev.h +1
-1@@ -1386,7 +1386,7 @@ struct block_device_operations {void (*submit_bio)(struct bio *bio);int (*poll_bio)(struct bio *bio,struct io_comp_batch *iob,unsigned int flags); -int (*open) (struct block_device *,fmode_t ); +int (*open)(struct gendisk *disk,fmode_t mode);void (*release) (struct gendisk *,fmode_t );int (*ioctl) (struct block_device *,fmode_t ,unsigned ,unsigned long );int (*compat_ioctl) (struct block_device *,fmode_t ,unsigned ,unsigned long );
Looks good to me,
(I didn't bother going through all the individual conversions.)
Re: [PATCH 09/31] block: pass a gendisk to ->open
In reply to Christoph HellwigQuoted 5 lines · On Tue, Jun 6, 2023 at 9:40 AM Christoph Hellwig <[email protected]> wrote:
->open is only called on the whole device. Make that explicit by passing a gendisk instead of the
block_device.Signed-off-by Christoph Hellwig <[email protected]>
Quoted 13 lines
--- arch/um/drivers/ubd_kern.c | 5 ++--- arch/xtensa/platforms/iss/simdisk.c | 4 ++-- block/bdev.c | 2 +- drivers/block/amiflop.c | 8 ++++---- drivers/block/aoe/aoeblk.c | 4 ++-- drivers/block/ataflop.c | 16 +++++++-------- drivers/block/drbd/drbd_main.c | 6 +++--- drivers/block/floppy.c | 30 +++++++++++++++-------------- drivers/block/nbd.c | 8 ++++---- drivers/block/pktcdvd.c | 6 +++--- drivers/block/rbd.c | 4 ++-- drivers/block/rnbd/rnbd-clt.c | 4 ++--
Re: [PATCH 09/31] block: pass a gendisk to ->open
In reply to Christoph HellwigQuoted 29 lines · Christoph Hellwig
->open is only called on the whole device. Make that explicit by passing a gendisk instead of the
block_device.Signed-off-by Christoph Hellwig <[email protected]>--- arch/um/drivers/ubd_kern.c | 5 ++--- arch/xtensa/platforms/iss/simdisk.c | 4 ++-- block/bdev.c | 2 +- drivers/block/amiflop.c | 8 ++++---- drivers/block/aoe/aoeblk.c | 4 ++-- drivers/block/ataflop.c | 16 +++++++-------- drivers/block/drbd/drbd_main.c | 6 +++--- drivers/block/floppy.c | 30 +++++++++++++++-------------- drivers/block/nbd.c | 8 ++++---- drivers/block/pktcdvd.c | 6 +++--- drivers/block/rbd.c | 4 ++-- drivers/block/rnbd/rnbd-clt.c | 4 ++-- drivers/block/swim.c | 10 +++++----- drivers/block/swim3.c | 10 +++++----- drivers/block/ublk_drv.c | 4 ++-- drivers/block/z2ram.c | 6 ++---- drivers/block/zram/zram_drv.c | 13 +++++-------- drivers/cdrom/gdrom.c | 4 ++-- drivers/md/bcache/super.c | 4 ++-- drivers/md/dm.c | 4 ++-- drivers/md/md.c | 6 +++--- drivers/mmc/core/block.c | 4 ++-- drivers/mtd/mtd_blkdevs.c | 4 ++-- drivers/mtd/ubi/block.c | 4 ++--
Quoted 9 lines
drivers/nvme/host/core.c | 4 ++-- drivers/nvme/host/multipath.c | 4 ++-- drivers/s390/block/dasd.c | 4 ++-- drivers/s390/block/dcssblk.c | 7 +++---- drivers/scsi/sd.c | 12 ++++++------ drivers/scsi/sr.c | 6 +++--- include/linux/blkdev.h | 2 +- 31 files changed, 102 insertions(+), 107 deletions(-)
Cheers,
Hannes
Christoph Hellwig
maintainerPATCH 10/31 block: remove the unused mode argument to ->release
In reply to Christoph HellwigThe mode argument to the ->release block_device_operation is never used, so remove it.
--- arch/um/drivers/ubd_kern.c | 4 ++-- arch/xtensa/platforms/iss/simdisk.c | 2 +- block/bdev.c | 14 +++++++------- drivers/block/amiflop.c | 2 +- drivers/block/aoe/aoeblk.c | 2 +- drivers/block/ataflop.c | 4 ++-- drivers/block/drbd/drbd_main.c | 4 ++-- drivers/block/floppy.c | 2 +- drivers/block/loop.c | 2 +- drivers/block/nbd.c | 2 +- drivers/block/pktcdvd.c | 4 ++-- drivers/block/rbd.c | 2 +- drivers/block/rnbd/rnbd-clt.c | 2 +- drivers/block/swim.c | 2 +- drivers/block/swim3.c | 3 +-- drivers/block/z2ram.c | 2 +- drivers/cdrom/gdrom.c | 2 +- drivers/md/bcache/super.c | 2 +- drivers/md/dm.c | 2 +- drivers/md/md.c | 2 +- drivers/mmc/core/block.c | 2 +- drivers/mtd/mtd_blkdevs.c | 2 +- drivers/mtd/ubi/block.c | 2 +- drivers/nvme/host/core.c | 2 +- drivers/nvme/host/multipath.c | 2 +- drivers/s390/block/dasd.c | 2 +- drivers/s390/block/dcssblk.c | 4 ++-- drivers/scsi/sd.c | 3 +-- drivers/scsi/sr.c | 2 +- include/linux/blkdev.h | 2 +- 30 files changed, 41 insertions(+), 43 deletions(-)
arch/um/drivers/ubd_kern.c +2 -2
@@ -109,7 +109,7 @@ static DEFINE_MUTEX(ubd_lock);static DEFINE_MUTEX (ubd_mutex);/* replaces BKL, might not be needed */ static int ubd_open (struct gendisk *disk,fmode_t mode); -static void ubd_release (struct gendisk *disk,fmode_t mode); +static void ubd_release (struct gendisk *disk);static int ubd_ioctl (struct block_device *bdev,fmode_t mode,unsigned int cmd,unsigned long arg);static int ubd_getgeo (struct block_device *bdev,struct hd_geometry *geo);
@@ -1182,7 +1182,7 @@ static int ubd_open(struct gendisk *disk, fmode_t mode)return err; } -static void ubd_release (struct gendisk *disk,fmode_t mode) +static void ubd_release (struct gendisk *disk) {struct ubd *ubd_dev = disk->private_data;
arch/xtensa/platforms/iss/simdisk.c +1 -1
@@ -130,7 +130,7 @@ static int simdisk_open(struct gendisk *disk, fmode_t mode)return 0 ; } -static void simdisk_release (struct gendisk *disk,fmode_t mode) +static void simdisk_release (struct gendisk *disk) {struct simdisk *dev = disk->private_data;spin_lock (&dev->lock);
block/bdev.c +7 -7
@@ -670,12 +670,12 @@ static int blkdev_get_whole(struct block_device *bdev, fmode_t mode)return 0 ; } -static void blkdev_put_whole (struct block_device *bdev,fmode_t mode) +static void blkdev_put_whole (struct block_device *bdev) {if (atomic_dec_and_test (&bdev->bd_openers))blkdev_flush_mapping (bdev);if (bdev->bd_disk->fops->release) - bdev->bd_disk->fops->release (bdev->bd_disk, mode); + bdev->bd_disk->fops->release (bdev->bd_disk); }static int blkdev_get_part (struct block_device *part,fmode_t mode)
@@ -699,11 +699,11 @@ static int blkdev_get_part(struct block_device *part, fmode_t mode)return 0 ; out_blkdev_put: -blkdev_put_whole (bdev_whole (part), mode); +blkdev_put_whole (bdev_whole (part));return ret; } -static void blkdev_put_part (struct block_device *part,fmode_t mode) +static void blkdev_put_part (struct block_device *part) {struct block_device *whole =bdev_whole (part);
@@ -711,7 +711,7 @@ static void blkdev_put_part(struct block_device *part, fmode_t mode)blkdev_flush_mapping (part); whole->bd_disk->open_partitions--; } -blkdev_put_whole (whole, mode); +blkdev_put_whole (whole); }struct block_device *blkdev_get_no_open (dev_t dev)
@@ -903,9 +903,9 @@ void blkdev_put(struct block_device *bdev, fmode_t mode)disk_flush_events (disk,DISK_EVENT_MEDIA_CHANGE );if (bdev_is_partition (bdev)) -blkdev_put_part (bdev, mode); +blkdev_put_part (bdev);else -blkdev_put_whole (bdev, mode); +blkdev_put_whole (bdev);mutex_unlock (&disk->open_mutex);module_put (disk->fops->owner);
drivers/block/amiflop.c +1 -1
@@ -1709,7 +1709,7 @@ static int floppy_open(struct gendisk *disk, fmode_t mode)return 0 ; } -static void floppy_release (struct gendisk *disk,fmode_t mode) +static void floppy_release (struct gendisk *disk) {struct amiga_floppy_struct *p = disk->private_data;int drive = p - unit;
drivers/block/aoe/aoeblk.c +1 -1
@@ -232,7 +232,7 @@ aoeblk_open(struct gendisk *disk, fmode_t mode) }static void -aoeblk_release (struct gendisk *disk,fmode_t mode) +aoeblk_release (struct gendisk *disk) {struct aoedev *d = disk->private_data;ulong flags;
drivers/block/ataflop.c +2 -2
@@ -448,7 +448,7 @@ static void fd_probe( int drive );static int fd_test_drive_present (int drive );static void config_types (void );static int floppy_open (struct gendisk *disk,fmode_t mode); -static void floppy_release (struct gendisk *disk,fmode_t mode); +static void floppy_release (struct gendisk *disk);/************************* End of Prototypes **************************/
@@ -1964,7 +1964,7 @@ static int floppy_unlocked_open(struct gendisk *disk, fmode_t mode)return ret; } -static void floppy_release (struct gendisk *disk,fmode_t mode) +static void floppy_release (struct gendisk *disk) {struct atari_floppy_struct *p = disk->private_data;mutex_lock (&ataflop_mutex);
drivers/block/drbd/drbd_main.c +2 -2
@@ -50,7 +50,7 @@static DEFINE_MUTEX (drbd_main_mutex);static int drbd_open (struct gendisk *disk,fmode_t mode); -static void drbd_release (struct gendisk *gd,fmode_t mode); +static void drbd_release (struct gendisk *gd);static void md_sync_timer_fn (struct timer_list *t);static int w_bitmap_io (struct drbd_work *w,int unused);
@@ -1908,7 +1908,7 @@ static int drbd_open(struct gendisk *disk, fmode_t mode)return rv; } -static void drbd_release (struct gendisk *gd,fmode_t mode) +static void drbd_release (struct gendisk *gd) {struct drbd_device *device = gd->private_data;mutex_lock (&drbd_main_mutex);
drivers/block/floppy.c +1 -1
@@ -3963,7 +3963,7 @@ static void __init config_types(void)pr_cont ("\n" ); } -static void floppy_release (struct gendisk *disk,fmode_t mode) +static void floppy_release (struct gendisk *disk) {int drive = (long )disk->private_data;
drivers/block/loop.c +1 -1
@@ -1727,7 +1727,7 @@ static int lo_compat_ioctl(struct block_device *bdev, fmode_t mode, }#endif -static void lo_release (struct gendisk *disk,fmode_t mode) +static void lo_release (struct gendisk *disk) {struct loop_device *lo = disk->private_data;
drivers/block/nbd.c +1 -1
@@ -1597,7 +1597,7 @@ static int nbd_open(struct gendisk *disk, fmode_t mode)return ret; } -static void nbd_release (struct gendisk *disk,fmode_t mode) +static void nbd_release (struct gendisk *disk) {struct nbd_device *nbd = disk->private_data;
drivers/block/pktcdvd.c +2 -2
@@ -2248,7 +2248,7 @@ static int pkt_open(struct gendisk *disk, fmode_t mode)return ret; } -static void pkt_close (struct gendisk *disk,fmode_t mode) +static void pkt_release (struct gendisk *disk) {struct pktcdvd_device *pd = disk->private_data;
@@ -2632,7 +2632,7 @@ static const struct block_device_operations pktcdvd_ops = { .owner = THIS_MODULE, .submit_bio = pkt_submit_bio, .open = pkt_open, - .release = pkt_close, + .release = pkt_release, .ioctl = pkt_ioctl, .compat_ioctl = blkdev_compat_ptr_ioctl, .check_events = pkt_check_events,
drivers/block/rbd.c +1 -1
@@ -679,7 +679,7 @@ static int rbd_open(struct gendisk *disk, fmode_t mode)return 0 ; } -static void rbd_release (struct gendisk *disk,fmode_t mode) +static void rbd_release (struct gendisk *disk) {struct rbd_device *rbd_dev = disk->private_data;unsigned long open_count_before;
drivers/block/rnbd/rnbd-clt.c +1 -1
@@ -935,7 +935,7 @@ static int rnbd_client_open(struct gendisk *disk, fmode_t mode)return 0 ; } -static void rnbd_client_release (struct gendisk *gen,fmode_t mode) +static void rnbd_client_release (struct gendisk *gen) {struct rnbd_clt_dev *dev = gen->private_data;
drivers/block/swim.c +1 -1
@@ -670,7 +670,7 @@ static int floppy_unlocked_open(struct gendisk *disk, fmode_t mode)return ret; } -static void floppy_release (struct gendisk *disk,fmode_t mode) +static void floppy_release (struct gendisk *disk) {struct floppy_state *fs = disk->private_data;struct swim __iomem *base = fs->swd->base;
drivers/block/swim3.c +1 -2
@@ -249,7 +249,6 @@ static int fd_eject(struct floppy_state *fs);static int floppy_ioctl (struct block_device *bdev,fmode_t mode,unsigned int cmd,unsigned long param);static int floppy_open (struct gendisk *disk,fmode_t mode); -static void floppy_release (struct gendisk *disk,fmode_t mode);static unsigned int floppy_check_events (struct gendisk *disk,unsigned int clearing);static int floppy_revalidate (struct gendisk *disk);
@@ -1004,7 +1003,7 @@ static int floppy_unlocked_open(struct block_device *bdev, fmode_t mode)return ret; } -static void floppy_release (struct gendisk *disk,fmode_t mode) +static void floppy_release (struct gendisk *disk) {struct floppy_state *fs = disk->private_data;struct swim3 __iomem *sw = fs->swim3;
drivers/block/z2ram.c +1 -1
@@ -288,7 +288,7 @@ static int z2_open(struct gendisk *disk, fmode_t mode)return rc; } -static void z2_release (struct gendisk *disk,fmode_t mode) +static void z2_release (struct gendisk *disk) {mutex_lock (&z2ram_mutex);if (current_device ==-1 ) {
drivers/cdrom/gdrom.c +1 -1
@@ -486,7 +486,7 @@ static int gdrom_bdops_open(struct gendisk *disk, fmode_t mode)return ret; } -static void gdrom_bdops_release (struct gendisk *disk,fmode_t mode) +static void gdrom_bdops_release (struct gendisk *disk) {mutex_lock (&gdrom_mutex);cdrom_release (gd.cd_info, mode);
drivers/md/bcache/super.c +1 -1
@@ -743,7 +743,7 @@ static int open_dev(struct gendisk *disk, fmode_t mode)return 0 ; } -static void release_dev (struct gendisk *b,fmode_t mode) +static void release_dev (struct gendisk *b) {struct bcache_device *d = b->private_data;
drivers/md/dm.c +1 -1
@@ -334,7 +334,7 @@ static int dm_blk_open(struct gendisk *disk, fmode_t mode)return md ?0 : -ENXIO ; } -static void dm_blk_close (struct gendisk *disk,fmode_t mode) +static void dm_blk_close (struct gendisk *disk) {struct mapped_device *md;
drivers/md/md.c +1 -1
@@ -7799,7 +7799,7 @@ static int md_open(struct gendisk *disk, fmode_t mode)return err; } -static void md_release (struct gendisk *disk,fmode_t mode) +static void md_release (struct gendisk *disk) {struct mddev *mddev = disk->private_data;
drivers/mmc/core/block.c +1 -1
@@ -375,7 +375,7 @@ static int mmc_blk_open(struct gendisk *disk, fmode_t mode)return ret; } -static void mmc_blk_release (struct gendisk *disk,fmode_t mode) +static void mmc_blk_release (struct gendisk *disk) {struct mmc_blk_data *md = disk->private_data;
drivers/mtd/mtd_blkdevs.c +1 -1
@@ -225,7 +225,7 @@ static int blktrans_open(struct gendisk *disk, fmode_t mode)return ret; } -static void blktrans_release (struct gendisk *disk,fmode_t mode) +static void blktrans_release (struct gendisk *disk) {struct mtd_blktrans_dev *dev = disk->private_data;
drivers/mtd/ubi/block.c +1 -1
@@ -270,7 +270,7 @@ static int ubiblock_open(struct gendisk *disk, fmode_t mode)return ret; } -static void ubiblock_release (struct gendisk *gd,fmode_t mode) +static void ubiblock_release (struct gendisk *gd) {struct ubiblock *dev = gd->private_data;
drivers/nvme/host/core.c +1 -1
@@ -1596,7 +1596,7 @@ static int nvme_open(struct gendisk *disk, fmode_t mode)return nvme_ns_open (disk->private_data); } -static void nvme_release (struct gendisk *disk,fmode_t mode) +static void nvme_release (struct gendisk *disk) {nvme_ns_release (disk->private_data); }
drivers/nvme/host/multipath.c +1 -1
@@ -409,7 +409,7 @@ static int nvme_ns_head_open(struct gendisk *disk, fmode_t mode)return 0 ; } -static void nvme_ns_head_release (struct gendisk *disk,fmode_t mode) +static void nvme_ns_head_release (struct gendisk *disk) {nvme_put_ns_head (disk->private_data); }
drivers/s390/block/dasd.c +1 -1
@@ -3287,7 +3287,7 @@ static int dasd_open(struct gendisk *disk, fmode_t mode)return rc; } -static void dasd_release (struct gendisk *disk,fmode_t mode) +static void dasd_release (struct gendisk *disk) {struct dasd_device *base =dasd_device_from_gendisk (disk);if (base) {
drivers/s390/block/dcssblk.c +2 -2
@@ -29,7 +29,7 @@#define DCSS_BUS_ID_SIZE 20static int dcssblk_open (struct gendisk *disk,fmode_t mode); -static void dcssblk_release (struct gendisk *disk,fmode_t mode); +static void dcssblk_release (struct gendisk *disk);static void dcssblk_submit_bio (struct bio *bio); static long dcssblk_dax_direct_access(struct dax_device *dax_dev, pgoff_t pgoff, long nr_pages, enum dax_access_mode mode, void **kaddr,
@@ -825,7 +825,7 @@ dcssblk_open(struct gendisk *disk, fmode_t mode) }static void -dcssblk_release (struct gendisk *disk,fmode_t mode) +dcssblk_release (struct gendisk *disk) {struct dcssblk_dev_info *dev_info = disk->private_data;struct segment_info *entry;
drivers/scsi/sd.c +1 -2
@@ -1373,7 +1373,6 @@ static int sd_open(struct gendisk *disk, fmode_t mode)* sd_release - invoked when the (last) close(2) is called on this * scsi disk. * @disk: disk to release -* @mode: FMODE_* mask * * Returns 0. *
@@ -1382,7 +1381,7 @@ static int sd_open(struct gendisk *disk, fmode_t mode)* * Locking: called with bdev->bd_disk->open_mutex held. **/ -static void sd_release (struct gendisk *disk,fmode_t mode) +static void sd_release (struct gendisk *disk) {struct scsi_disk *sdkp =scsi_disk (disk);struct scsi_device *sdev = sdkp->device;
drivers/scsi/sr.c +1 -1
@@ -507,7 +507,7 @@ static int sr_block_open(struct gendisk *disk, fmode_t mode)return ret; } -static void sr_block_release (struct gendisk *disk,fmode_t mode) +static void sr_block_release (struct gendisk *disk) {struct scsi_cd *cd =scsi_cd (disk);
include/linux/blkdev.h +1 -1
@@ -1387,7 +1387,7 @@ struct block_device_operations {int (*poll_bio)(struct bio *bio,struct io_comp_batch *iob,unsigned int flags);int (*open)(struct gendisk *disk,fmode_t mode); -void (*release) (struct gendisk *,fmode_t ); +void (*release)(struct gendisk *disk);int (*ioctl) (struct block_device *,fmode_t ,unsigned ,unsigned long );int (*compat_ioctl) (struct block_device *,fmode_t ,unsigned ,unsigned long ); unsigned int (*check_events) (struct gendisk *disk,
Signature · 1 line
2.39.2
Re: [PATCH 10/31] block: remove the unused mode argument to ->release
Quoted 5 lines · Christoph Hellwig
The mode argument to the ->release
block_device_operationis never used, so remove it.Signed-off-by Christoph Hellwig <[email protected]>---
Good cleanup. Looks good to me,
Re: [PATCH 10/31] block: remove the unused mode argument to ->release
In reply to Christoph HellwigQuoted 5 lines · On Tue, Jun 6, 2023 at 9:40 AM Christoph Hellwig <[email protected]> wrote:
The mode argument to the ->release
block_device_operationis never used, so remove it.Signed-off-by Christoph Hellwig <[email protected]>
Quoted 14 lines
--- arch/um/drivers/ubd_kern.c | 4 ++-- arch/xtensa/platforms/iss/simdisk.c | 2 +- block/bdev.c | 14 +++++++------- drivers/block/amiflop.c | 2 +- drivers/block/aoe/aoeblk.c | 2 +- drivers/block/ataflop.c | 4 ++-- drivers/block/drbd/drbd_main.c | 4 ++-- drivers/block/floppy.c | 2 +- drivers/block/loop.c | 2 +- drivers/block/nbd.c | 2 +- drivers/block/pktcdvd.c | 4 ++-- drivers/block/rbd.c | 2 +- drivers/block/rnbd/rnbd-clt.c | 2 +-
Re: [PATCH 10/31] block: remove the unused mode argument to ->release
In reply to Christoph HellwigQuoted 28 lines · Christoph Hellwig
The mode argument to the ->release
block_device_operationis never used, so remove it.Signed-off-by Christoph Hellwig <[email protected]>--- arch/um/drivers/ubd_kern.c | 4 ++-- arch/xtensa/platforms/iss/simdisk.c | 2 +- block/bdev.c | 14 +++++++------- drivers/block/amiflop.c | 2 +- drivers/block/aoe/aoeblk.c | 2 +- drivers/block/ataflop.c | 4 ++-- drivers/block/drbd/drbd_main.c | 4 ++-- drivers/block/floppy.c | 2 +- drivers/block/loop.c | 2 +- drivers/block/nbd.c | 2 +- drivers/block/pktcdvd.c | 4 ++-- drivers/block/rbd.c | 2 +- drivers/block/rnbd/rnbd-clt.c | 2 +- drivers/block/swim.c | 2 +- drivers/block/swim3.c | 3 +-- drivers/block/z2ram.c | 2 +- drivers/cdrom/gdrom.c | 2 +- drivers/md/bcache/super.c | 2 +- drivers/md/dm.c | 2 +- drivers/md/md.c | 2 +- drivers/mmc/core/block.c | 2 +- drivers/mtd/mtd_blkdevs.c | 2 +- drivers/mtd/ubi/block.c | 2 +-
Quoted 9 lines
drivers/nvme/host/core.c | 2 +- drivers/nvme/host/multipath.c | 2 +- drivers/s390/block/dasd.c | 2 +- drivers/s390/block/dcssblk.c | 4 ++-- drivers/scsi/sd.c | 3 +-- drivers/scsi/sr.c | 2 +- include/linux/blkdev.h | 2 +- 30 files changed, 41 insertions(+), 43 deletions(-)
Cheers,
Hannes
Christoph Hellwig
maintainerPATCH 11/31 block: rename blkdev_close to blkdev_release
In reply to Christoph HellwigMake the function name match the method name.
--- block/fops.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
block/fops.c +2 -2
@@ -500,7 +500,7 @@ static int blkdev_open(struct inode *inode, struct file *filp)return 0 ; } -static int blkdev_close (struct inode *inode,struct file *filp) +static int blkdev_release (struct inode *inode,struct file *filp) {struct block_device *bdev = filp->private_data;
@@ -677,7 +677,7 @@ static long blkdev_fallocate(struct file *file, int mode, loff_t start,const struct file_operations def_blk_fops = { .open = blkdev_open, - .release = blkdev_close, + .release = blkdev_release, .llseek = blkdev_llseek, .read_iter = blkdev_read_iter, .write_iter = blkdev_write_iter,
Signature · 1 line
2.39.2
Re: [PATCH 11/31] block: rename blkdev_close to blkdev_release
Quoted 4 lines · Christoph Hellwig
Make the function name match the method name.
Signed-off-by Christoph Hellwig <[email protected]>---
Looks good to me,
Re: [PATCH 11/31] block: rename blkdev_close to blkdev_release
In reply to Christoph HellwigQuoted 7 lines · Christoph Hellwig
Make the function name match the method name.
Signed-off-by Christoph Hellwig <[email protected]>--- block/fops.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
Cheers,
Hannes
Christoph Hellwig
maintainerPATCH 12/31 swsusp: don't pass a stack address to blkdev_get_by_path
In reply to Christoph Hellwigholder is just an on-stack pointer that can easily be reused by other calls, replace it with a static variable that doesn't change.
--- kernel/power/swap.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
kernel/power/swap.c +3 -2
@@ -1510,6 +1510,8 @@ int swsusp_read(unsigned int *flags_p)return error; } +static void *swsusp_holder; +/** * swsusp_check - Check for swsusp signature in the resume device */
@@ -1517,14 +1519,13 @@ int swsusp_read(unsigned int *flags_p)int swsusp_check (bool snapshot_test) {int error; -void *holder;fmode_t mode =FMODE_READ ;if (snapshot_test) mode |=FMODE_EXCL ; hib_resume_bdev =blkdev_get_by_dev (swsusp_resume_device, - mode, &holder,NULL ); + mode, &swsusp_holder,NULL );if (!IS_ERR (hib_resume_bdev)) {set_blocksize (hib_resume_bdev,PAGE_SIZE );clear_page (swsusp_header);
Signature · 1 line
2.39.2
Re: [PATCH 12/31] swsusp: don't pass a stack address to blkdev_get_by_path
Quoted 8 lines · Christoph Hellwig
holder is just an on-stack pointer that can easily be reused by other calls, replace it with a static variable that doesn't change.
Signed-off-by Christoph Hellwig <[email protected]>--- kernel/power/swap.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
Cheers,
Hannes
Christoph Hellwig
maintainerPATCH 13/31 bcache: don't pass a stack address to blkdev_get_by_path
In reply to Christoph Hellwigsb is just an on-stack pointer that can easily be reused by other calls. Switch to use the bcache-wide bcache_kobj instead as there is no need to claim per-bcache device anyway.
--- drivers/md/bcache/super.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/md/bcache/super.c +1 -1
@@ -2560,7 +2560,7 @@ static ssize_t register_bcache(struct kobject *k, struct kobj_attribute *attr, err ="failed to open device" ; bdev =blkdev_get_by_path (strim (path),FMODE_READ |FMODE_WRITE |FMODE_EXCL , - sb,NULL ); + bcache_kobj,NULL );if (IS_ERR (bdev)) {if (bdev ==ERR_PTR (-EBUSY )) {dev_t dev;
Signature · 1 line
2.39.2
Re: [PATCH 13/31] bcache: don't pass a stack address to blkdev_get_by_path
Quoted 9 lines · Christoph Hellwig
sb is just an on-stack pointer that can easily be reused by other calls. Switch to use the bcache-wide
bcache_kobjinstead as there is no need to claim per-bcache device anyway.Signed-off-by Christoph Hellwig <[email protected]>--- drivers/md/bcache/super.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Cheers,
Hannes
Christoph Hellwig
maintainerPATCH 14/31 rnbd-srv: don't pass a holder for non-exclusive blkdev_get_by_path
In reply to Christoph HellwigPassing a holder to blkdev_get_by_path when FMODE_EXCL isn't set doesn't make sense, so pass NULL instead.
--- drivers/block/rnbd/rnbd-srv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/block/rnbd/rnbd-srv.c +1 -1
@@ -719,7 +719,7 @@ static int process_msg_open(struct rnbd_srv_session *srv_sess, goto reject; } - bdev =blkdev_get_by_path (full_path, open_flags,THIS_MODULE ,NULL ); + bdev =blkdev_get_by_path (full_path, open_flags,NULL ,NULL );if (IS_ERR (bdev)) { ret =PTR_ERR (bdev); pr_err("Opening device '%s' on session %s failed, failed to open the block device, err: %d\n",
Signature · 1 line
2.39.2
Re: [PATCH 14/31] rnbd-srv: don't pass a holder for non-exclusive blkdev_get_by_path
Quoted 5 lines · Christoph Hellwig
Passing a holder to
blkdev_get_by_pathwhenFMODE_EXCLisn't set doesn't make sense, so pass NULL instead.Signed-off-by Christoph Hellwig <[email protected]>---
Looks good to me,
Re: [PATCH 14/31] rnbd-srv: don't pass a holder for non-exclusive blkdev_get_by_path
In reply to Christoph HellwigQuoted 5 lines · On Tue, Jun 6, 2023 at 9:40 AM Christoph Hellwig…
Passing a holder to
blkdev_get_by_pathwhenFMODE_EXCLisn't set doesn't make sense, so pass NULL instead.Signed-off-by Christoph Hellwig <[email protected]>
Quoted 20 lines
--- drivers/block/rnbd/rnbd-srv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/block/rnbd/rnbd-srv.c +1
-2@@ -719,7 +719,7 @@ static int process_msg_open(struct rnbd_srv_session *srv_sess, goto reject; } - bdev =blkdev_get_by_path (full_path, open_flags,THIS_MODULE ,NULL ); + bdev =blkdev_get_by_path (full_path, open_flags,NULL ,NULL );if (IS_ERR (bdev)) { ret =PTR_ERR (bdev); pr_err("Opening device '%s' on session %s failed, failed to open the block device, err: %d\n", --2.39.2
Re: [PATCH 14/31] rnbd-srv: don't pass a holder for non-exclusive blkdev_get_by_path
In reply to Christoph HellwigQuoted 8 lines · Christoph Hellwig
Passing a holder to
blkdev_get_by_pathwhenFMODE_EXCLisn't set doesn't make sense, so pass NULL instead.Signed-off-by Christoph Hellwig <[email protected]>--- drivers/block/rnbd/rnbd-srv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Cheers,
Hannes
Christoph Hellwig
maintainerPATCH 15/31 btrfs: don't pass a holder for non-exclusive blkdev_get_by_path
In reply to Christoph HellwigPassing a holder to blkdev_get_by_path when FMODE_EXCL isn't set doesn't make sense, so pass NULL instead and remove the holder argument from the call chains the only end up in non-FMODE_EXCL blkdev_get_by_path calls.
--- fs/btrfs/super.c | 16 ++++++---------- fs/btrfs/volumes.c | 17 ++++++++--------- fs/btrfs/volumes.h | 3 +-- 3 files changed, 15 insertions(+), 21 deletions(-)
fs/btrfs/super.c +6 -10
@@ -849,8 +849,7 @@ int btrfs_parse_options(struct btrfs_fs_info *info, char *options,* All other options will be parsed on much later in the mount process and * only when we need to allocate a new super block. */ -static int btrfs_parse_device_options (const char *options,fmode_t flags, -void *holder) +static int btrfs_parse_device_options (const char *options,fmode_t flags) {substring_t args[MAX_OPT_ARGS ];char *device_name, *opts, *orig, *p;
@@ -884,8 +883,7 @@ static int btrfs_parse_device_options(const char *options, fmode_t flags, error = -ENOMEM ; goto out; } - device =btrfs_scan_one_device (device_name, flags, - holder); + device =btrfs_scan_one_device (device_name, flags);kfree (device_name);if (IS_ERR (device)) { error =PTR_ERR (device);
@@ -1477,13 +1475,13 @@ static struct dentry *btrfs_mount_root(struct file_system_type *fs_type, }mutex_lock (&uuid_mutex); - error =btrfs_parse_device_options (data, mode, fs_type); + error =btrfs_parse_device_options (data, mode);if (error) {mutex_unlock (&uuid_mutex); goto error_fs_info; } - device =btrfs_scan_one_device (device_name, mode, fs_type); + device =btrfs_scan_one_device (device_name, mode);if (IS_ERR (device)) {mutex_unlock (&uuid_mutex); error =PTR_ERR (device);
@@ -2190,8 +2188,7 @@ static long btrfs_control_ioctl(struct file *file, unsigned int cmd,switch (cmd) {case BTRFS_IOC_SCAN_DEV :mutex_lock (&uuid_mutex); - device =btrfs_scan_one_device (vol->name,FMODE_READ , - &btrfs_root_fs_type); + device =btrfs_scan_one_device (vol->name,FMODE_READ ); ret =PTR_ERR_OR_ZERO (device);mutex_unlock (&uuid_mutex);break ;
@@ -2205,8 +2202,7 @@ static long btrfs_control_ioctl(struct file *file, unsigned int cmd,break ;case BTRFS_IOC_DEVICES_READY :mutex_lock (&uuid_mutex); - device =btrfs_scan_one_device (vol->name,FMODE_READ , - &btrfs_root_fs_type); + device =btrfs_scan_one_device (vol->name,FMODE_READ );if (IS_ERR (device)) {mutex_unlock (&uuid_mutex); ret =PTR_ERR (device);
fs/btrfs/volumes.c +8 -9
@@ -1348,8 +1348,7 @@ int btrfs_forget_devices(dev_t devt)* and we are not allowed to call set_blocksize during the scan. The superblock * is read via pagecache */ -struct btrfs_device *btrfs_scan_one_device (const char *path,fmode_t flags, -void *holder) +struct btrfs_device *btrfs_scan_one_device (const char *path,fmode_t flags) {struct btrfs_super_block *disk_super;bool new_device_added = false;
@@ -1368,16 +1367,16 @@ struct btrfs_device *btrfs_scan_one_device(const char *path, fmode_t flags,*/ /* -* Avoid using flag |= FMODE_EXCL here, as the systemd-udev may -* initiate the device scan which may race with the user's mount -* or mkfs command, resulting in failure. -* Since the device scan is solely for reading purposes, there is -* no need for FMODE_EXCL. Additionally, the devices are read again +* Avoid an exclusive open here, as the systemd-udev may initiate the +* device scan which may race with the user's mount or mkfs command, +* resulting in failure. +* Since the device scan is solely for reading purposes, there is no +* need for an exclusive open. Additionally, the devices are read again * during the mount process. It is ok to get some inconsistent * values temporarily, as the device paths of the fsid are the only * required information for assembling the volume. */ - bdev =blkdev_get_by_path (path, flags, holder,NULL ); + bdev =blkdev_get_by_path (path, flags,NULL ,NULL );if (IS_ERR (bdev))return ERR_CAST (bdev);
@@ -2381,7 +2380,7 @@ int btrfs_get_dev_args_from_path(struct btrfs_fs_info *fs_info,return -ENOMEM ; } - ret =btrfs_get_bdev_and_sb (path,FMODE_READ , fs_info->bdev_holder,0 , + ret =btrfs_get_bdev_and_sb (path,FMODE_READ ,NULL ,0 , &bdev, &disk_super);if (ret) {btrfs_put_dev_args_from_path (args);
fs/btrfs/volumes.h +1 -2
@@ -600,8 +600,7 @@ struct btrfs_block_group *btrfs_create_chunk(struct btrfs_trans_handle *trans,void btrfs_mapping_tree_free (struct extent_map_tree *tree);int btrfs_open_devices (struct btrfs_fs_devices *fs_devices,fmode_t flags,void *holder); -struct btrfs_device *btrfs_scan_one_device (const char *path, -fmode_t flags,void *holder); +struct btrfs_device *btrfs_scan_one_device (const char *path,fmode_t flags);int btrfs_forget_devices (dev_t devt);void btrfs_close_devices (struct btrfs_fs_devices *fs_devices);void btrfs_free_extra_devids (struct btrfs_fs_devices *fs_devices);
Signature · 1 line
2.39.2
Re: [PATCH 15/31] btrfs: don't pass a holder for non-exclusive blkdev_get_by_path
Quoted 6 lines · Christoph Hellwig
Passing a holder to
blkdev_get_by_pathwhenFMODE_EXCLisn't set doesn't make sense, so pass NULL instead and remove the holder argument from the call chains the only end up in non-FMODE_EXCLblkdev_get_by_pathcalls.Signed-off-by Christoph Hellwig <[email protected]>---
Looks good to me,
Re: [PATCH 15/31] btrfs: don't pass a holder for non-exclusive blkdev_get_by_path
In reply to Christoph HellwigQuoted 11 lines · Christoph Hellwig
Passing a holder to
blkdev_get_by_pathwhenFMODE_EXCLisn't set doesn't make sense, so pass NULL instead and remove the holder argument from the call chains the only end up in non-FMODE_EXCLblkdev_get_by_pathcalls.Signed-off-by Christoph Hellwig <[email protected]>--- fs/btrfs/super.c | 16 ++++++---------- fs/btrfs/volumes.c | 17 ++++++++--------- fs/btrfs/volumes.h | 3 +-- 3 files changed, 15 insertions(+), 21 deletions(-)
Cheers,
Hannes
Re: [PATCH 15/31] btrfs: don't pass a holder for non-exclusive blkdev_get_by_path
In reply to Christoph HellwigQuoted 3 lines · Christoph Hellwig
Passing a holder to
blkdev_get_by_pathwhenFMODE_EXCLisn't set doesn't make sense, so pass NULL instead and remove the holder argument from the call chains the only end up in non-FMODE_EXCLblkdev_get_by_pathcalls.
Please add
"Exclusive mode for device scanning is not used since 50d281fc434c
("btrfs: scan device in non-exclusive mode")."
Christoph Hellwig
maintainerPATCH 16/31 block: use the holder as indication for exclusive opens
In reply to Christoph HellwigThe current interface for exclusive opens is rather confusing as it requires both the FMODE_EXCL flag and a holder. Remove the need to pass FMODE_EXCL and just key off the exclusive open off a non-NULL holder.
For blkdev_put this requires adding the holder argument, which provides better debug checking that only the holder actually releases the hold, but at the same time allows removing the now superfluous mode argument.
--- block/bdev.c | 37 ++++++++++++++++------------ block/fops.c | 6 +++-- block/genhd.c | 5 ++-- block/ioctl.c | 5 ++-- drivers/block/drbd/drbd_nl.c | 23 ++++++++++------- drivers/block/pktcdvd.c | 13 +++++----- drivers/block/rnbd/rnbd-srv.c | 4 +-- drivers/block/xen-blkback/xenbus.c | 2 +- drivers/block/zram/zram_drv.c | 8 +++--- drivers/md/bcache/super.c | 15 ++++++------ drivers/md/dm.c | 6 ++--- drivers/md/md.c | 38 +++++++++++++++-------------- drivers/mtd/devices/block2mtd.c | 4 +-- drivers/nvme/target/io-cmd-bdev.c | 2 +- drivers/s390/block/dasd_genhd.c | 2 +- drivers/target/target_core_iblock.c | 6 ++--- drivers/target/target_core_pscsi.c | 8 +++--- fs/btrfs/dev-replace.c | 6 ++--- fs/btrfs/ioctl.c | 12 ++++----- fs/btrfs/volumes.c | 28 ++++++++++----------- fs/btrfs/volumes.h | 6 ++--- fs/erofs/super.c | 7 +++--- fs/ext4/super.c | 11 +++------ fs/f2fs/super.c | 2 +- fs/jfs/jfs_logmgr.c | 6 ++--- fs/nfs/blocklayout/dev.c | 4 +-- fs/nilfs2/super.c | 6 ++--- fs/ocfs2/cluster/heartbeat.c | 4 +-- fs/reiserfs/journal.c | 19 +++++++-------- fs/reiserfs/reiserfs.h | 1 - fs/super.c | 20 +++++++-------- fs/xfs/xfs_super.c | 15 ++++++------ include/linux/blkdev.h | 2 +- kernel/power/hibernate.c | 12 +++------ kernel/power/power.h | 2 +- kernel/power/swap.c | 21 +++++++--------- mm/swapfile.c | 7 +++--- 37 files changed, 183 insertions(+), 192 deletions(-)
block/bdev.c +21 -16
@@ -604,7 +604,7 @@ void bd_abort_claiming(struct block_device *bdev, void *holder) }EXPORT_SYMBOL (bd_abort_claiming); -static void bd_end_claim (struct block_device *bdev) +static void bd_end_claim (struct block_device *bdev,void *holder) {struct block_device *whole =bdev_whole (bdev);bool unblock = false;
@@ -614,6 +614,7 @@ static void bd_end_claim(struct block_device *bdev)* bdev_lock. open_mutex is used to synchronize disk_holder unlinking. */ mutex_lock (&bdev_lock); +WARN_ON_ONCE (bdev->bd_holder != holder);WARN_ON_ONCE (--bdev->bd_holders <0 );WARN_ON_ONCE (--whole->bd_holders <0 );if (!bdev->bd_holders) {
@@ -750,10 +751,9 @@ void blkdev_put_no_open(struct block_device *bdev)* @holder: exclusive holder identifier * @hops: holder operations * -* Open the block device described by device number @dev. If @mode includes -* %FMODE_EXCL, the block device is opened with exclusive access. Specifying -* %FMODE_EXCL with a %NULL @holder is invalid. Exclusive opens may nest for -* the same @holder. +* Open the block device described by device number @dev. If @holder is not +* %NULL, the block device is opened with exclusive access. Exclusive opens may +* nest for the same @holder. * * Use this interface ONLY if you really do not have anything better - i.e. when * you are behind a truly sucky interface and all you are given is a device
@@ -785,10 +785,16 @@ struct block_device *blkdev_get_by_dev(dev_t dev, fmode_t mode, void *holder,return ERR_PTR (-ENXIO ); disk = bdev->bd_disk; -if (mode &FMODE_EXCL ) { +if (holder) { + mode |=FMODE_EXCL ; ret =bd_prepare_to_claim (bdev, holder, hops);if (ret) goto put_blkdev; + }else { +if (WARN_ON_ONCE (mode &FMODE_EXCL )) { + ret = -EIO ; + goto put_blkdev; + } }disk_block_events (disk);
@@ -805,7 +811,7 @@ struct block_device *blkdev_get_by_dev(dev_t dev, fmode_t mode, void *holder, ret =blkdev_get_whole (bdev, mode);if (ret) goto put_module; -if (mode &FMODE_EXCL ) { +if (holder) {bd_finish_claiming (bdev, holder, hops);/*
@@ -829,7 +835,7 @@ struct block_device *blkdev_get_by_dev(dev_t dev, fmode_t mode, void *holder, put_module:module_put (disk->fops->owner); abort_claiming: -if (mode &FMODE_EXCL ) +if (holder)bd_abort_claiming (bdev, holder);mutex_unlock (&disk->open_mutex);disk_unblock_events (disk);
@@ -845,10 +851,9 @@ EXPORT_SYMBOL(blkdev_get_by_dev);* @mode: FMODE_* mask * @holder: exclusive holder identifier * -* Open the block device described by the device file at @path. If @mode -* includes %FMODE_EXCL, the block device is opened with exclusive access. -* Specifying %FMODE_EXCL with a %NULL @holder is invalid. Exclusive opens may -* nest for the same @holder. +* Open the block device described by the device file at @path. If @holder is +* not %NULL, the block device is opened with exclusive access. Exclusive opens +* may nest for the same @holder. * * CONTEXT: * Might sleep.
@@ -869,7 +874,7 @@ struct block_device *blkdev_get_by_path(const char *path, fmode_t mode, bdev =blkdev_get_by_dev (dev, mode, holder, hops);if (!IS_ERR (bdev) && (mode &FMODE_WRITE ) &&bdev_read_only (bdev)) { -blkdev_put (bdev, mode); +blkdev_put (bdev, holder);return ERR_PTR (-EACCES ); }
@@ -877,7 +882,7 @@ struct block_device *blkdev_get_by_path(const char *path, fmode_t mode, }EXPORT_SYMBOL (blkdev_get_by_path); -void blkdev_put (struct block_device *bdev,fmode_t mode) +void blkdev_put (struct block_device *bdev,void *holder) {struct gendisk *disk = bdev->bd_disk;
@@ -892,8 +897,8 @@ void blkdev_put(struct block_device *bdev, fmode_t mode)sync_blockdev (bdev);mutex_lock (&disk->open_mutex); -if (mode &FMODE_EXCL ) -bd_end_claim (bdev); +if (holder) +bd_end_claim (bdev, holder);/* * Trigger event checking and tell drivers to flush MEDIA_CHANGE
block/fops.c +4 -2
@@ -490,7 +490,9 @@ static int blkdev_open(struct inode *inode, struct file *filp)if ((filp->f_flags &O_ACCMODE ) ==3 ) filp->f_mode |=FMODE_WRITE_IOCTL ; - bdev =blkdev_get_by_dev (inode->i_rdev, filp->f_mode, filp,NULL ); + bdev =blkdev_get_by_dev (inode->i_rdev, filp->f_mode, + (filp->f_mode &FMODE_EXCL ) ? filp :NULL , +NULL );if (IS_ERR (bdev))return PTR_ERR (bdev);
@@ -504,7 +506,7 @@ static int blkdev_release(struct inode *inode, struct file *filp) {struct block_device *bdev = filp->private_data; -blkdev_put (bdev, filp->f_mode); +blkdev_put (bdev, (filp->f_mode &FMODE_EXCL ) ? filp :NULL );return 0 ; }
block/genhd.c +2 -3
@@ -365,12 +365,11 @@ int disk_scan_partitions(struct gendisk *disk, fmode_t mode) }set_bit (GD_NEED_PART_SCAN , &disk->state); - bdev =blkdev_get_by_dev (disk_devt (disk), mode & ~FMODE_EXCL ,NULL , -NULL ); + bdev =blkdev_get_by_dev (disk_devt (disk), mode,NULL ,NULL );if (IS_ERR (bdev)) ret =PTR_ERR (bdev);else -blkdev_put (bdev, mode & ~FMODE_EXCL ); +blkdev_put (bdev,NULL );/* * If blkdev_get_by_dev() failed early, GD_NEED_PART_SCAN is still set,
block/ioctl.c +2 -3
@@ -454,11 +454,10 @@ static int blkdev_bszset(struct block_device *bdev, fmode_t mode,if (mode &FMODE_EXCL )return set_blocksize (bdev, n); -if (IS_ERR (blkdev_get_by_dev (bdev->bd_dev, mode |FMODE_EXCL , &bdev, -NULL ))) +if (IS_ERR (blkdev_get_by_dev (bdev->bd_dev, mode, &bdev,NULL )))return -EBUSY ; ret =set_blocksize (bdev, n); -blkdev_put (bdev, mode |FMODE_EXCL ); +blkdev_put (bdev, &bdev);return ret; }
drivers/block/drbd/drbd_nl.c +14 -9
@@ -1640,8 +1640,7 @@ static struct block_device *open_backing_dev(struct drbd_device *device,struct block_device *bdev;int err =0 ; - bdev =blkdev_get_by_path (bdev_path, -FMODE_READ |FMODE_WRITE |FMODE_EXCL , + bdev =blkdev_get_by_path (bdev_path,FMODE_READ |FMODE_WRITE , claim_ptr,NULL );if (IS_ERR (bdev)) { drbd_err(device, "open(\"%s\") failed with %ld\n",
@@ -1654,7 +1653,7 @@ static struct block_device *open_backing_dev(struct drbd_device *device, err =bd_link_disk_holder (bdev, device->vdisk);if (err) { -blkdev_put (bdev,FMODE_READ |FMODE_WRITE |FMODE_EXCL ); +blkdev_put (bdev, claim_ptr);drbd_err (device,"bd_link_disk_holder(\"%s\", ...) failed with %d\n" , bdev_path, err); bdev =ERR_PTR (err);
@@ -1696,13 +1695,13 @@ static int open_backing_devices(struct drbd_device *device, }static void close_backing_dev (struct drbd_device *device,struct block_device *bdev, -bool do_bd_unlink) +void *claim_ptr,bool do_bd_unlink) {if (!bdev)return ;if (do_bd_unlink)bd_unlink_disk_holder (bdev, device->vdisk); -blkdev_put (bdev,FMODE_READ |FMODE_WRITE |FMODE_EXCL ); +blkdev_put (bdev, claim_ptr); }void drbd_backing_dev_free (struct drbd_device *device,struct drbd_backing_dev *ldev)
@@ -1710,8 +1709,11 @@ void drbd_backing_dev_free(struct drbd_device *device, struct drbd_backing_dev *if (ldev ==NULL )return ; -close_backing_dev (device, ldev->md_bdev, ldev->md_bdev != ldev->backing_bdev); -close_backing_dev (device, ldev->backing_bdev, true); +close_backing_dev (device, ldev->md_bdev, + ldev->md.meta_dev_idx <0 ? + (void *)device : (void *)drbd_m_holder, + ldev->md_bdev != ldev->backing_bdev); +close_backing_dev (device, ldev->backing_bdev, device, true);kfree (ldev->disk_conf);kfree (ldev);
@@ -2127,8 +2129,11 @@ int drbd_adm_attach(struct sk_buff *skb, struct genl_info *info) fail:conn_reconfig_done (connection);if (nbc) { -close_backing_dev (device, nbc->md_bdev, nbc->md_bdev != nbc->backing_bdev); -close_backing_dev (device, nbc->backing_bdev, true); +close_backing_dev (device, nbc->md_bdev, + nbc->disk_conf->meta_dev_idx <0 ? + (void *)device : (void *)drbd_m_holder, + nbc->md_bdev != nbc->backing_bdev); +close_backing_dev (device, nbc->backing_bdev, device, true);kfree (nbc); }kfree (new_disk_conf);
drivers/block/pktcdvd.c +6 -7
@@ -2125,8 +2125,7 @@ static int pkt_open_dev(struct pktcdvd_device *pd, fmode_t write)* to read/write from/to it. It is already opened in O_NONBLOCK mode * so open should not fail. */ - bdev =blkdev_get_by_dev (pd->bdev->bd_dev,FMODE_READ |FMODE_EXCL , pd, -NULL ); + bdev =blkdev_get_by_dev (pd->bdev->bd_dev,FMODE_READ , pd,NULL );if (IS_ERR (bdev)) { ret =PTR_ERR (bdev); goto out;
@@ -2173,7 +2172,7 @@ static int pkt_open_dev(struct pktcdvd_device *pd, fmode_t write)return 0 ; out_putdev: -blkdev_put (bdev,FMODE_READ |FMODE_EXCL ); +blkdev_put (bdev, pd); out:return ret; }
@@ -2190,7 +2189,7 @@ static void pkt_release_dev(struct pktcdvd_device *pd, int flush)pkt_lock_door (pd,0 );pkt_set_speed (pd,MAX_SPEED ,MAX_SPEED ); -blkdev_put (pd->bdev,FMODE_READ |FMODE_EXCL ); +blkdev_put (pd->bdev, pd);pkt_shrink_pktlist (pd); }
@@ -2536,7 +2535,7 @@ static int pkt_new_dev(struct pktcdvd_device *pd, dev_t dev)return PTR_ERR (bdev); sdev =scsi_device_from_queue (bdev->bd_disk->queue);if (!sdev) { -blkdev_put (bdev,FMODE_READ |FMODE_NDELAY ); +blkdev_put (bdev,NULL );return -EINVAL ; }put_device (&sdev->sdev_gendev);
@@ -2561,7 +2560,7 @@ static int pkt_new_dev(struct pktcdvd_device *pd, dev_t dev)return 0 ; out_mem: -blkdev_put (bdev,FMODE_READ |FMODE_NDELAY ); +blkdev_put (bdev,NULL );/* This is safe: open() is still holding a reference. */ module_put (THIS_MODULE );return -ENOMEM ;
@@ -2764,7 +2763,7 @@ static int pkt_remove_dev(dev_t pkt_dev)pkt_debugfs_dev_remove (pd);pkt_sysfs_dev_remove (pd); -blkdev_put (pd->bdev,FMODE_READ |FMODE_NDELAY ); +blkdev_put (pd->bdev,NULL );remove_proc_entry (pd->name, pkt_proc);pkt_dbg (1 , pd,"writer unmapped\n" );
drivers/block/rnbd/rnbd-srv.c +2 -2
@@ -219,7 +219,7 @@ void rnbd_destroy_sess_dev(struct rnbd_srv_sess_dev *sess_dev, bool keep_id)rnbd_put_sess_dev (sess_dev);wait_for_completion (&dc);/* wait for inflights to drop to zero */ -blkdev_put (sess_dev->bdev, sess_dev->open_flags); +blkdev_put (sess_dev->bdev,NULL );mutex_lock (&sess_dev->dev->lock);list_del (&sess_dev->dev_list);if (sess_dev->open_flags &FMODE_WRITE )
@@ -795,7 +795,7 @@ static int process_msg_open(struct rnbd_srv_session *srv_sess, }rnbd_put_srv_dev (srv_dev); blkdev_put: -blkdev_put (bdev, open_flags); +blkdev_put (bdev,NULL ); free_path:kfree (full_path); reject:
drivers/block/xen-blkback/xenbus.c +1 -1
@@ -473,7 +473,7 @@ static void xenvbd_sysfs_delif(struct xenbus_device *dev)static void xen_vbd_free (struct xen_vbd *vbd) {if (vbd->bdev) -blkdev_put (vbd->bdev, vbd->readonly ?FMODE_READ :FMODE_WRITE ); +blkdev_put (vbd->bdev,NULL ); vbd->bdev =NULL ; }
drivers/block/zram/zram_drv.c +4 -4
@@ -420,7 +420,7 @@ static void reset_bdev(struct zram *zram)return ; bdev = zram->bdev; -blkdev_put (bdev,FMODE_READ |FMODE_WRITE |FMODE_EXCL ); +blkdev_put (bdev, zram);/* hope filp_close flush all of IO */ filp_close (zram->backing_dev,NULL ); zram->backing_dev =NULL ;
@@ -507,8 +507,8 @@ static ssize_t backing_dev_store(struct device *dev, goto out; } - bdev =blkdev_get_by_dev (inode->i_rdev, -FMODE_READ |FMODE_WRITE |FMODE_EXCL , zram,NULL ); + bdev =blkdev_get_by_dev (inode->i_rdev,FMODE_READ |FMODE_WRITE , zram, +NULL );if (IS_ERR (bdev)) { err =PTR_ERR (bdev); bdev =NULL ;
@@ -539,7 +539,7 @@ static ssize_t backing_dev_store(struct device *dev,kvfree (bitmap);if (bdev) -blkdev_put (bdev,FMODE_READ |FMODE_WRITE |FMODE_EXCL ); +blkdev_put (bdev, zram);if (backing_dev)filp_close (backing_dev,NULL );
drivers/md/bcache/super.c +7 -8
@@ -1369,7 +1369,7 @@ static void cached_dev_free(struct closure *cl)put_page (virt_to_page (dc->sb_disk));if (!IS_ERR_OR_NULL (dc->bdev)) -blkdev_put (dc->bdev,FMODE_READ |FMODE_WRITE |FMODE_EXCL ); +blkdev_put (dc->bdev, bcache_kobj);wake_up (&unregister_wait);
@@ -2218,7 +2218,7 @@ void bch_cache_release(struct kobject *kobj)put_page (virt_to_page (ca->sb_disk));if (!IS_ERR_OR_NULL (ca->bdev)) -blkdev_put (ca->bdev,FMODE_READ |FMODE_WRITE |FMODE_EXCL ); +blkdev_put (ca->bdev, bcache_kobj);kfree (ca);module_put (THIS_MODULE );
@@ -2359,7 +2359,7 @@ static int register_cache(struct cache_sb *sb, struct cache_sb_disk *sb_disk,* call blkdev_put() to bdev in bch_cache_release(). So we * explicitly call blkdev_put() here. */ -blkdev_put (bdev,FMODE_READ |FMODE_WRITE |FMODE_EXCL ); +blkdev_put (bdev, bcache_kobj);if (ret == -ENOMEM ) err ="cache_alloc(): -ENOMEM" ;else if (ret == -EPERM )
@@ -2461,7 +2461,7 @@ static void register_bdev_worker(struct work_struct *work)if (!dc) { fail = true;put_page (virt_to_page (args->sb_disk)); -blkdev_put (args->bdev,FMODE_READ |FMODE_WRITE |FMODE_EXCL ); +blkdev_put (args->bdev, bcache_kobj); goto out; }
@@ -2491,7 +2491,7 @@ static void register_cache_worker(struct work_struct *work)if (!ca) { fail = true;put_page (virt_to_page (args->sb_disk)); -blkdev_put (args->bdev,FMODE_READ |FMODE_WRITE |FMODE_EXCL ); +blkdev_put (args->bdev, bcache_kobj); goto out; }
@@ -2558,8 +2558,7 @@ static ssize_t register_bcache(struct kobject *k, struct kobj_attribute *attr, ret = -EINVAL ; err ="failed to open device" ; - bdev =blkdev_get_by_path (strim (path), -FMODE_READ |FMODE_WRITE |FMODE_EXCL , + bdev =blkdev_get_by_path (strim (path),FMODE_READ |FMODE_WRITE , bcache_kobj,NULL );if (IS_ERR (bdev)) {if (bdev ==ERR_PTR (-EBUSY )) {
@@ -2648,7 +2647,7 @@ static ssize_t register_bcache(struct kobject *k, struct kobj_attribute *attr, out_put_sb_page:put_page (virt_to_page (sb_disk)); out_blkdev_put: -blkdev_put (bdev,FMODE_READ |FMODE_WRITE |FMODE_EXCL ); +blkdev_put (bdev, register_bcache); out_free_sb:kfree (sb); out_free_path:
drivers/md/dm.c +3 -3
@@ -746,7 +746,7 @@ static struct table_device *open_table_device(struct mapped_device *md,return ERR_PTR (-ENOMEM );refcount_set (&td->count,1 ); - bdev =blkdev_get_by_dev (dev, mode |FMODE_EXCL , _dm_claim_ptr,NULL ); + bdev =blkdev_get_by_dev (dev, mode, _dm_claim_ptr,NULL );if (IS_ERR (bdev)) { r =PTR_ERR (bdev); goto out_free_td;
@@ -771,7 +771,7 @@ static struct table_device *open_table_device(struct mapped_device *md,return td; out_blkdev_put: -blkdev_put (bdev, mode |FMODE_EXCL ); +blkdev_put (bdev, _dm_claim_ptr); out_free_td:kfree (td);return ERR_PTR (r);
@@ -784,7 +784,7 @@ static void close_table_device(struct table_device *td, struct mapped_device *md {if (md->disk->slave_dir)bd_unlink_disk_holder (td->dm_dev.bdev, md->disk); -blkdev_put (td->dm_dev.bdev, td->dm_dev.mode |FMODE_EXCL ); +blkdev_put (td->dm_dev.bdev, _dm_claim_ptr);put_dax (td->dm_dev.dax_dev);list_del (&td->list);kfree (td);
drivers/md/md.c +20 -18
@@ -2449,7 +2449,10 @@ static void rdev_delayed_delete(struct work_struct *ws)void md_autodetect_dev (dev_t dev); -static void export_rdev (struct md_rdev *rdev) +/* just for claiming the bdev */ +static struct md_rdev claim_rdev; + +static void export_rdev (struct md_rdev *rdev,struct mddev *mddev) {pr_debug ("md: export_rdev(%pg)\n" , rdev->bdev);md_rdev_clear (rdev);
@@ -2457,7 +2460,7 @@ static void export_rdev(struct md_rdev *rdev)if (test_bit (AutoDetected, &rdev->flags))md_autodetect_dev (rdev->bdev->bd_dev);#endif -blkdev_put (rdev->bdev,FMODE_READ |FMODE_WRITE |FMODE_EXCL ); +blkdev_put (rdev->bdev, mddev->major_version ==-2 ? &claim_rdev : rdev); rdev->bdev =NULL ;kobject_put (&rdev->kobj); }
@@ -2485,7 +2488,7 @@ static void md_kick_rdev_from_array(struct md_rdev *rdev)INIT_WORK (&rdev->del_work, rdev_delayed_delete);kobject_get (&rdev->kobj);queue_work (md_rdev_misc_wq, &rdev->del_work); -export_rdev (rdev); +export_rdev (rdev, rdev->mddev); }static void export_array (struct mddev *mddev)
@@ -3612,6 +3615,7 @@ int md_rdev_init(struct md_rdev *rdev)return badblocks_init (&rdev->badblocks,0 ); }EXPORT_SYMBOL_GPL (md_rdev_init); +/* * Import a device. If 'super_format' >= 0, then sanity check the superblock *
@@ -3624,7 +3628,6 @@ EXPORT_SYMBOL_GPL(md_rdev_init);*/ static struct md_rdev *md_import_device (dev_t newdev,int super_format,int super_minor) { -static struct md_rdev claim_rdev;/* just for claiming the bdev */ struct md_rdev *rdev;sector_t size;int err;
@@ -3640,8 +3643,7 @@ static struct md_rdev *md_import_device(dev_t newdev, int super_format, int supeif (err) goto out_clear_rdev; - rdev->bdev =blkdev_get_by_dev (newdev, -FMODE_READ |FMODE_WRITE |FMODE_EXCL , + rdev->bdev =blkdev_get_by_dev (newdev,FMODE_READ |FMODE_WRITE , super_format ==-2 ? &claim_rdev : rdev,NULL );if (IS_ERR (rdev->bdev)) { pr_warn("md: could not open device unknown-block(%u,%u).\n",
@@ -3679,7 +3681,7 @@ static struct md_rdev *md_import_device(dev_t newdev, int super_format, int supereturn rdev; out_blkdev_put: -blkdev_put (rdev->bdev,FMODE_READ |FMODE_WRITE |FMODE_EXCL ); +blkdev_put (rdev->bdev, super_format ==-2 ? &claim_rdev : rdev); out_clear_rdev:md_rdev_clear (rdev); out_free_rdev:
@@ -4560,7 +4562,7 @@ new_dev_store(struct mddev *mddev, const char *buf, size_t len) err =bind_rdev_to_array (rdev, mddev); out:if (err) -export_rdev (rdev); +export_rdev (rdev, mddev);mddev_unlock (mddev);if (!err)md_new_event ();
@@ -6498,7 +6500,7 @@ static void autorun_devices(int part)rdev_for_each_list (rdev, tmp, &candidates) {list_del_init (&rdev->same_set);if (bind_rdev_to_array (rdev, mddev)) -export_rdev (rdev); +export_rdev (rdev, mddev); }autorun_array (mddev);mddev_unlock (mddev);
@@ -6508,7 +6510,7 @@ static void autorun_devices(int part)*/ rdev_for_each_list (rdev, tmp, &candidates) {list_del_init (&rdev->same_set); -export_rdev (rdev); +export_rdev (rdev, mddev); }mddev_put (mddev); }
@@ -6696,13 +6698,13 @@ int md_add_new_disk(struct mddev *mddev, struct mdu_disk_info_s *info)pr_warn ("md: %pg has different UUID to %pg\n" , rdev->bdev, rdev0->bdev); -export_rdev (rdev); +export_rdev (rdev, mddev);return -EINVAL ; } } err =bind_rdev_to_array (rdev, mddev);if (err) -export_rdev (rdev); +export_rdev (rdev, mddev);return err; }
@@ -6746,7 +6748,7 @@ int md_add_new_disk(struct mddev *mddev, struct mdu_disk_info_s *info)/* This was a hot-add request, but events doesn't * match, so reject it. */ -export_rdev (rdev); +export_rdev (rdev, mddev);return -EINVAL ; }
@@ -6772,7 +6774,7 @@ int md_add_new_disk(struct mddev *mddev, struct mdu_disk_info_s *info) } }if (has_journal || mddev->bitmap) { -export_rdev (rdev); +export_rdev (rdev, mddev);return -EBUSY ; }set_bit (Journal, &rdev->flags);
@@ -6787,7 +6789,7 @@ int md_add_new_disk(struct mddev *mddev, struct mdu_disk_info_s *info)/* --add initiated by this node */ err = md_cluster_ops->add_new_disk (mddev, rdev);if (err) { -export_rdev (rdev); +export_rdev (rdev, mddev);return err; } }
@@ -6797,7 +6799,7 @@ int md_add_new_disk(struct mddev *mddev, struct mdu_disk_info_s *info) err =bind_rdev_to_array (rdev, mddev);if (err) -export_rdev (rdev); +export_rdev (rdev, mddev);if (mddev_is_clustered (mddev)) {if (info->state & (1 <<MD_DISK_CANDIDATE )) {
@@ -6860,7 +6862,7 @@ int md_add_new_disk(struct mddev *mddev, struct mdu_disk_info_s *info) err =bind_rdev_to_array (rdev, mddev);if (err) { -export_rdev (rdev); +export_rdev (rdev, mddev);return err; } }
@@ -6985,7 +6987,7 @@ static int hot_add_disk(struct mddev *mddev, dev_t dev)return 0 ; abort_export: -export_rdev (rdev); +export_rdev (rdev, mddev);return err; }
drivers/mtd/devices/block2mtd.c +2 -2
@@ -209,7 +209,7 @@ static void block2mtd_free_device(struct block2mtd_dev *dev)if (dev->blkdev) {invalidate_mapping_pages (dev->blkdev->bd_inode->i_mapping,0 ,-1 ); -blkdev_put (dev->blkdev,FMODE_READ |FMODE_WRITE |FMODE_EXCL ); +blkdev_put (dev->blkdev,NULL ); }kfree (dev);
@@ -261,7 +261,7 @@ static struct block_device __ref *mdtblock_early_get_bdev(const char *devname,static struct block2mtd_dev *add_device (char *devname,int erase_size,char *label,int timeout) { -const fmode_t mode =FMODE_READ |FMODE_WRITE |FMODE_EXCL ; +const fmode_t mode =FMODE_READ |FMODE_WRITE ;struct block_device *bdev;struct block2mtd_dev *dev;char *name;
drivers/nvme/target/io-cmd-bdev.c +1 -1
@@ -51,7 +51,7 @@ void nvmet_bdev_set_limits(struct block_device *bdev, struct nvme_id_ns *id)void nvmet_bdev_ns_disable (struct nvmet_ns *ns) {if (ns->bdev) { -blkdev_put (ns->bdev,FMODE_WRITE |FMODE_READ ); +blkdev_put (ns->bdev,NULL ); ns->bdev =NULL ; } }
drivers/s390/block/dasd_genhd.c +1 -1
@@ -179,7 +179,7 @@ void dasd_destroy_partitions(struct dasd_block *block)mutex_unlock (&bdev->bd_disk->open_mutex);/* Matching blkdev_put to the blkdev_get in dasd_scan_partitions. */ -blkdev_put (bdev,FMODE_READ ); +blkdev_put (bdev,NULL ); }int dasd_gendisk_init (void )
drivers/target/target_core_iblock.c +3 -3
@@ -108,7 +108,7 @@ static int iblock_configure_device(struct se_device *dev)pr_debug ("IBLOCK: Claiming struct block_device: %s\n" , ib_dev->ibd_udev_path); - mode =FMODE_READ |FMODE_EXCL ; + mode =FMODE_READ ;if (!ib_dev->ibd_readonly) mode |=FMODE_WRITE ;else
@@ -175,7 +175,7 @@ static int iblock_configure_device(struct se_device *dev)return 0 ; out_blkdev_put: -blkdev_put (ib_dev->ibd_bd,FMODE_WRITE |FMODE_READ |FMODE_EXCL ); +blkdev_put (ib_dev->ibd_bd, ib_dev); out_free_bioset:bioset_exit (&ib_dev->ibd_bio_set); out:
@@ -201,7 +201,7 @@ static void iblock_destroy_device(struct se_device *dev)struct iblock_dev *ib_dev =IBLOCK_DEV (dev);if (ib_dev->ibd_bd !=NULL ) -blkdev_put (ib_dev->ibd_bd,FMODE_WRITE |FMODE_READ |FMODE_EXCL ); +blkdev_put (ib_dev->ibd_bd, ib_dev);bioset_exit (&ib_dev->ibd_bio_set); }
drivers/target/target_core_pscsi.c +3 -5
@@ -366,8 +366,7 @@ static int pscsi_create_type_disk(struct se_device *dev, struct scsi_device *sd)* Claim exclusive struct block_device access to struct scsi_device * for TYPE_DISK and TYPE_ZBC using supplied udev_path */ - bd =blkdev_get_by_path (dev->udev_path, -FMODE_WRITE |FMODE_READ |FMODE_EXCL , pdv, + bd =blkdev_get_by_path (dev->udev_path,FMODE_WRITE |FMODE_READ , pdv,NULL );if (IS_ERR (bd)) {pr_err ("pSCSI: blkdev_get_by_path() failed\n" );
@@ -378,7 +377,7 @@ static int pscsi_create_type_disk(struct se_device *dev, struct scsi_device *sd) ret =pscsi_add_device_to_list (dev, sd);if (ret) { -blkdev_put (pdv->pdv_bd,FMODE_WRITE |FMODE_READ |FMODE_EXCL ); +blkdev_put (pdv->pdv_bd, pdv);scsi_device_put (sd);return ret; }
@@ -566,8 +565,7 @@ static void pscsi_destroy_device(struct se_device *dev)*/ if ((sd->type ==TYPE_DISK || sd->type ==TYPE_ZBC ) && pdv->pdv_bd) { -blkdev_put (pdv->pdv_bd, -FMODE_WRITE |FMODE_READ |FMODE_EXCL ); +blkdev_put (pdv->pdv_bd, pdv); pdv->pdv_bd =NULL ; }/*
fs/btrfs/dev-replace.c +3 -3
@@ -257,7 +257,7 @@ static int btrfs_init_dev_replace_tgtdev(struct btrfs_fs_info *fs_info,return -EINVAL ; } - bdev =blkdev_get_by_path (device_path,FMODE_WRITE |FMODE_EXCL , + bdev =blkdev_get_by_path (device_path,FMODE_WRITE , fs_info->bdev_holder,NULL );if (IS_ERR (bdev)) {btrfs_err (fs_info,"target device %s is invalid!" , device_path);
@@ -315,7 +315,7 @@ static int btrfs_init_dev_replace_tgtdev(struct btrfs_fs_info *fs_info, device->bdev = bdev;set_bit (BTRFS_DEV_STATE_IN_FS_METADATA , &device->dev_state);set_bit (BTRFS_DEV_STATE_REPLACE_TGT , &device->dev_state); - device->mode =FMODE_EXCL ; + device->holder = fs_info->bdev_holder; device->dev_stats_valid =1 ;set_blocksize (device->bdev,BTRFS_BDEV_BLOCKSIZE ); device->fs_devices = fs_devices;
@@ -334,7 +334,7 @@ static int btrfs_init_dev_replace_tgtdev(struct btrfs_fs_info *fs_info,return 0 ; error: -blkdev_put (bdev,FMODE_EXCL ); +blkdev_put (bdev, fs_info->bdev_holder);return ret; }
fs/btrfs/ioctl.c +6 -6
@@ -2672,7 +2672,7 @@ static long btrfs_ioctl_rm_dev_v2(struct file *file, void __user *arg)struct btrfs_fs_info *fs_info =btrfs_sb (inode->i_sb);struct btrfs_ioctl_vol_args_v2 *vol_args;struct block_device *bdev =NULL ; -fmode_t mode; +void *holder;int ret;bool cancel = false;
@@ -2709,7 +2709,7 @@ static long btrfs_ioctl_rm_dev_v2(struct file *file, void __user *arg) goto err_drop;/* Exclusive operation is now claimed */ - ret =btrfs_rm_device (fs_info, &args, &bdev, &mode); + ret =btrfs_rm_device (fs_info, &args, &bdev, &holder);btrfs_exclop_finish (fs_info);
@@ -2724,7 +2724,7 @@ static long btrfs_ioctl_rm_dev_v2(struct file *file, void __user *arg) err_drop:mnt_drop_write_file (file);if (bdev) -blkdev_put (bdev, mode); +blkdev_put (bdev, holder); out:btrfs_put_dev_args_from_path (&args);kfree (vol_args);
@@ -2738,7 +2738,7 @@ static long btrfs_ioctl_rm_dev(struct file *file, void __user *arg)struct btrfs_fs_info *fs_info =btrfs_sb (inode->i_sb);struct btrfs_ioctl_vol_args *vol_args;struct block_device *bdev =NULL ; -fmode_t mode; +void *holder;int ret;bool cancel = false;
@@ -2765,7 +2765,7 @@ static long btrfs_ioctl_rm_dev(struct file *file, void __user *arg) ret =exclop_start_or_cancel_reloc (fs_info,BTRFS_EXCLOP_DEV_REMOVE , cancel);if (ret ==0 ) { - ret =btrfs_rm_device (fs_info, &args, &bdev, &mode); + ret =btrfs_rm_device (fs_info, &args, &bdev, &holder);if (!ret)btrfs_info (fs_info,"disk deleted %s" , vol_args->name);btrfs_exclop_finish (fs_info);
@@ -2773,7 +2773,7 @@ static long btrfs_ioctl_rm_dev(struct file *file, void __user *arg)mnt_drop_write_file (file);if (bdev) -blkdev_put (bdev, mode); +blkdev_put (bdev, holder); out:btrfs_put_dev_args_from_path (&args);kfree (vol_args);
fs/btrfs/volumes.c +13 -15
@@ -507,14 +507,14 @@ btrfs_get_bdev_and_sb(const char *device_path, fmode_t flags, void *holder,sync_blockdev (*bdev); ret =set_blocksize (*bdev,BTRFS_BDEV_BLOCKSIZE );if (ret) { -blkdev_put (*bdev, flags); +blkdev_put (*bdev, holder); goto error; }invalidate_bdev (*bdev); *disk_super =btrfs_read_dev_super (*bdev);if (IS_ERR (*disk_super)) { ret =PTR_ERR (*disk_super); -blkdev_put (*bdev, flags); +blkdev_put (*bdev, holder); goto error; }
@@ -642,7 +642,7 @@ static int btrfs_open_one_device(struct btrfs_fs_devices *fs_devices, device->bdev = bdev;clear_bit (BTRFS_DEV_STATE_IN_FS_METADATA , &device->dev_state); - device->mode = flags; + device->holder = holder; fs_devices->open_devices++; if (test_bit(BTRFS_DEV_STATE_WRITEABLE, &device->dev_state) &&
@@ -656,7 +656,7 @@ static int btrfs_open_one_device(struct btrfs_fs_devices *fs_devices, error_free_page:btrfs_release_disk_super (disk_super); -blkdev_put (bdev, flags); +blkdev_put (bdev, holder);return -EINVAL ; }
@@ -1057,7 +1057,7 @@ static void __btrfs_free_extra_devids(struct btrfs_fs_devices *fs_devices,continue ;if (device->bdev) { -blkdev_put (device->bdev, device->mode); +blkdev_put (device->bdev, device->holder); device->bdev =NULL ; fs_devices->open_devices--; }
@@ -1103,7 +1103,7 @@ static void btrfs_close_bdev(struct btrfs_device *device)invalidate_bdev (device->bdev); } -blkdev_put (device->bdev, device->mode); +blkdev_put (device->bdev, device->holder); }static void btrfs_close_one_device (struct btrfs_device *device)
@@ -1213,8 +1213,6 @@ static int open_fs_devices(struct btrfs_fs_devices *fs_devices,struct btrfs_device *latest_dev =NULL ;struct btrfs_device *tmp_device; - flags |=FMODE_EXCL ; -list_for_each_entry_safe (device, tmp_device, &fs_devices->devices, dev_list) {int ret;
@@ -1400,7 +1398,7 @@ struct btrfs_device *btrfs_scan_one_device(const char *path, fmode_t flags)btrfs_release_disk_super (disk_super); error_bdev_put: -blkdev_put (bdev, flags); +blkdev_put (bdev,NULL );return device; }
@@ -2087,7 +2085,7 @@ void btrfs_scratch_superblocks(struct btrfs_fs_info *fs_info,int btrfs_rm_device (struct btrfs_fs_info *fs_info,struct btrfs_dev_lookup_args *args, -struct block_device **bdev,fmode_t *mode) +struct block_device **bdev,void **holder) {struct btrfs_trans_handle *trans;struct btrfs_device *device;
@@ -2226,7 +2224,7 @@ int btrfs_rm_device(struct btrfs_fs_info *fs_info, } *bdev = device->bdev; - *mode = device->mode; + *holder = device->holder;synchronize_rcu ();btrfs_free_device (device);
@@ -2394,7 +2392,7 @@ int btrfs_get_dev_args_from_path(struct btrfs_fs_info *fs_info,else memcpy (args->fsid, disk_super->fsid,BTRFS_FSID_SIZE );btrfs_release_disk_super (disk_super); -blkdev_put (bdev,FMODE_READ ); +blkdev_put (bdev,NULL );return 0 ; }
@@ -2627,7 +2625,7 @@ int btrfs_init_new_device(struct btrfs_fs_info *fs_info, const char *device_pathif (sb_rdonly (sb) && !fs_devices->seeding)return -EROFS ; - bdev =blkdev_get_by_path (device_path,FMODE_WRITE |FMODE_EXCL , + bdev =blkdev_get_by_path (device_path,FMODE_WRITE , fs_info->bdev_holder,NULL );if (IS_ERR (bdev))return PTR_ERR (bdev);
@@ -2690,7 +2688,7 @@ int btrfs_init_new_device(struct btrfs_fs_info *fs_info, const char *device_path device->commit_total_bytes = device->total_bytes;set_bit (BTRFS_DEV_STATE_IN_FS_METADATA , &device->dev_state);clear_bit (BTRFS_DEV_STATE_REPLACE_TGT , &device->dev_state); - device->mode =FMODE_EXCL ; + device->holder = fs_info->bdev_holder; device->dev_stats_valid =1 ;set_blocksize (device->bdev,BTRFS_BDEV_BLOCKSIZE );
@@ -2848,7 +2846,7 @@ int btrfs_init_new_device(struct btrfs_fs_info *fs_info, const char *device_path error_free_device:btrfs_free_device (device); error: -blkdev_put (bdev,FMODE_EXCL ); +blkdev_put (bdev, fs_info->bdev_holder);if (locked) {mutex_unlock (&uuid_mutex);up_write (&sb->s_umount);
fs/btrfs/volumes.h +3 -3
@@ -94,8 +94,8 @@ struct btrfs_device {struct btrfs_zoned_device_info *zone_info; -/* the mode sent to blkdev_get */ -fmode_t mode; +/* block device holder for blkdev_get/put */ +void *holder;/* * Device's major-minor number. Must be set even if the device is not
@@ -619,7 +619,7 @@ void btrfs_put_dev_args_from_path(struct btrfs_dev_lookup_args *args);void btrfs_free_device (struct btrfs_device *device);int btrfs_rm_device (struct btrfs_fs_info *fs_info,struct btrfs_dev_lookup_args *args, -struct block_device **bdev,fmode_t *mode); +struct block_device **bdev,void **holder); void __exit btrfs_cleanup_fs_uuids(void);int btrfs_num_copies (struct btrfs_fs_info *fs_info,u64 logical,u64 len); int btrfs_grow_device(struct btrfs_trans_handle *trans,
fs/erofs/super.c +4 -3
@@ -19,6 +19,7 @@#include <trace/events/erofs.h> static struct kmem_cache *erofs_inode_cachep__read_mostly ; +struct file_system_type erofs_fs_type;void _erofs_err (struct super_block *sb,const char *function,const char *fmt, ...)
@@ -253,8 +254,8 @@ static int erofs_init_device(struct erofs_buf *buf, struct super_block *sb,return PTR_ERR (fscache); dif->fscache = fscache; }else if (!sbi->devs->flatdev) { - bdev =blkdev_get_by_path (dif->path,FMODE_READ |FMODE_EXCL , - sb->s_type,NULL ); + bdev =blkdev_get_by_path (dif->path,FMODE_READ , sb->s_type, +NULL );if (IS_ERR (bdev))return PTR_ERR (bdev); dif->bdev = bdev;
@@ -877,7 +878,7 @@ static int erofs_release_device_info(int id, void *ptr, void *data)fs_put_dax (dif->dax_dev,NULL );if (dif->bdev) -blkdev_put (dif->bdev,FMODE_READ |FMODE_EXCL ); +blkdev_put (dif->bdev, &erofs_fs_type);erofs_fscache_unregister_cookie (dif->fscache); dif->fscache =NULL ;kfree (dif->path);
fs/ext4/super.c +3 -8
@@ -1112,7 +1112,7 @@ static struct block_device *ext4_blkdev_get(dev_t dev, struct super_block *sb) {struct block_device *bdev; - bdev =blkdev_get_by_dev (dev,FMODE_READ |FMODE_WRITE |FMODE_EXCL , sb, + bdev =blkdev_get_by_dev (dev,FMODE_READ |FMODE_WRITE , sb, &ext4_holder_ops);if (IS_ERR (bdev)) goto fail;
@@ -1128,17 +1128,12 @@ static struct block_device *ext4_blkdev_get(dev_t dev, struct super_block *sb)/* * Release the journal device */ -static void ext4_blkdev_put (struct block_device *bdev) -{ -blkdev_put (bdev,FMODE_READ |FMODE_WRITE |FMODE_EXCL ); -} -static void ext4_blkdev_remove (struct ext4_sb_info *sbi) {struct block_device *bdev; bdev = sbi->s_journal_bdev;if (bdev) { -ext4_blkdev_put (bdev); +blkdev_put (bdev, sbi->s_es); sbi->s_journal_bdev =NULL ; } }
@@ -5915,7 +5910,7 @@ static journal_t *ext4_get_dev_journal(struct super_block *sb, out_journal:jbd2_journal_destroy (journal); out_bdev: -ext4_blkdev_put (bdev); +blkdev_put (bdev, sb);return NULL ; }
fs/f2fs/super.c +1 -1
@@ -1538,7 +1538,7 @@ static void destroy_device_list(struct f2fs_sb_info *sbi)int i;for (i =0 ; i < sbi->s_ndevs; i++) { -blkdev_put (FDEV (i).bdev,FMODE_EXCL ); +blkdev_put (FDEV (i).bdev, sbi->sb->s_type);#ifdef CONFIG_BLK_DEV_ZONED kvfree (FDEV (i).blkz_seq);#endif
fs/jfs/jfs_logmgr.c +3 -3
@@ -1100,7 +1100,7 @@ int lmLogOpen(struct super_block *sb)* file systems to log may have n-to-1 relationship; */ - bdev =blkdev_get_by_dev (sbi->logdev,FMODE_READ |FMODE_WRITE |FMODE_EXCL , + bdev =blkdev_get_by_dev (sbi->logdev,FMODE_READ |FMODE_WRITE , log,NULL );if (IS_ERR (bdev)) { rc =PTR_ERR (bdev);
@@ -1141,7 +1141,7 @@ int lmLogOpen(struct super_block *sb)lbmLogShutdown (log); close:/* close external log device */ -blkdev_put (bdev,FMODE_READ |FMODE_WRITE |FMODE_EXCL ); +blkdev_put (bdev, log); free:/* free log descriptor */ mutex_unlock (&jfs_log_mutex);
@@ -1485,7 +1485,7 @@ int lmLogClose(struct super_block *sb) bdev = log->bdev; rc =lmLogShutdown (log); -blkdev_put (bdev,FMODE_READ |FMODE_WRITE |FMODE_EXCL ); +blkdev_put (bdev, log);kfree (log);
fs/nfs/blocklayout/dev.c +2 -2
@@ -35,7 +35,7 @@ bl_free_device(struct pnfs_block_dev *dev) }if (dev->bdev) -blkdev_put (dev->bdev,FMODE_READ |FMODE_WRITE ); +blkdev_put (dev->bdev,NULL ); } }
@@ -374,7 +374,7 @@ bl_parse_scsi(struct nfs_server *server, struct pnfs_block_dev *d,return 0 ; out_blkdev_put: -blkdev_put (d->bdev,FMODE_READ |FMODE_WRITE ); +blkdev_put (d->bdev,NULL );return error; }
fs/nilfs2/super.c +3 -3
@@ -1278,7 +1278,7 @@ nilfs_mount(struct file_system_type *fs_type, int flags, {struct nilfs_super_data sd;struct super_block *s; -fmode_t mode =FMODE_READ |FMODE_EXCL ; +fmode_t mode =FMODE_READ ;struct dentry *root_dentry;int err, s_new = false;
@@ -1357,7 +1357,7 @@ nilfs_mount(struct file_system_type *fs_type, int flags, }if (!s_new) -blkdev_put (sd.bdev, mode); +blkdev_put (sd.bdev, fs_type);return root_dentry;
@@ -1366,7 +1366,7 @@ nilfs_mount(struct file_system_type *fs_type, int flags, failed:if (!s_new) -blkdev_put (sd.bdev, mode); +blkdev_put (sd.bdev, fs_type);return ERR_PTR (err); }
fs/ocfs2/cluster/heartbeat.c +2 -2
@@ -1503,7 +1503,7 @@ static void o2hb_region_release(struct config_item *item) }if (reg->hr_bdev) -blkdev_put (reg->hr_bdev,FMODE_READ |FMODE_WRITE ); +blkdev_put (reg->hr_bdev,NULL );kfree (reg->hr_slots);
@@ -1893,7 +1893,7 @@ static ssize_t o2hb_region_dev_store(struct config_item *item, out3:if (ret <0 ) { -blkdev_put (reg->hr_bdev,FMODE_READ |FMODE_WRITE ); +blkdev_put (reg->hr_bdev,NULL ); reg->hr_bdev =NULL ; } out2:
fs/reiserfs/journal.c +9 -10
@@ -2589,7 +2589,7 @@ static void release_journal_dev(struct super_block *super, struct reiserfs_journal *journal) {if (journal->j_dev_bd !=NULL ) { -blkdev_put (journal->j_dev_bd, journal->j_dev_mode); +blkdev_put (journal->j_dev_bd, journal); journal->j_dev_bd =NULL ; } }
@@ -2598,9 +2598,10 @@ static int journal_init_dev(struct super_block *super,struct reiserfs_journal *journal, const char *jdev_name) { + fmode_t blkdev_mode = FMODE_READ; +void *holder = journal;int result;dev_t jdev; -fmode_t blkdev_mode =FMODE_READ |FMODE_WRITE |FMODE_EXCL ; result =0 ;
@@ -2608,16 +2609,15 @@ static int journal_init_dev(struct super_block *super, jdev =SB_ONDISK_JOURNAL_DEVICE (super) ?new_decode_dev (SB_ONDISK_JOURNAL_DEVICE (super)) : super->s_dev; -if (bdev_read_only (super->s_bdev)) - blkdev_mode =FMODE_READ ; +if (!bdev_read_only (super->s_bdev)) + blkdev_mode |=FMODE_WRITE ;/* there is no "jdev" option and journal is on separate device */ if ((!jdev_name || !jdev_name[0 ])) {if (jdev == super->s_dev) - blkdev_mode &= ~FMODE_EXCL ; - journal->j_dev_bd =blkdev_get_by_dev (jdev, blkdev_mode, - journal,NULL ); - journal->j_dev_mode = blkdev_mode; + holder =NULL ; + journal->j_dev_bd =blkdev_get_by_dev (jdev, blkdev_mode, holder, +NULL );if (IS_ERR (journal->j_dev_bd)) { result =PTR_ERR (journal->j_dev_bd); journal->j_dev_bd =NULL ;
@@ -2631,8 +2631,7 @@ static int journal_init_dev(struct super_block *super,return 0 ; } - journal->j_dev_mode = blkdev_mode; - journal->j_dev_bd =blkdev_get_by_path (jdev_name, blkdev_mode, journal, + journal->j_dev_bd =blkdev_get_by_path (jdev_name, blkdev_mode, holder,NULL );if (IS_ERR (journal->j_dev_bd)) { result =PTR_ERR (journal->j_dev_bd);
fs/reiserfs/reiserfs.h +0 -1
@@ -300,7 +300,6 @@ struct reiserfs_journal {struct reiserfs_journal_cnode *j_first;struct block_device *j_dev_bd; -fmode_t j_dev_mode;/* first block on s_dev of reserved area journal */ int j_1st_reserved_block;
fs/super.c +9 -11
@@ -1255,7 +1255,7 @@ int get_tree_bdev(struct fs_context *fc, {struct block_device *bdev;struct super_block *s; -fmode_t mode =FMODE_READ |FMODE_EXCL ; +fmode_t mode =FMODE_READ ;int error =0 ;if (!(fc->sb_flags &SB_RDONLY ))
@@ -1279,7 +1279,7 @@ int get_tree_bdev(struct fs_context *fc,if (bdev->bd_fsfreeze_count >0 ) {mutex_unlock (&bdev->bd_fsfreeze_mutex);warnf (fc,"%pg: Can't mount, blockdev is frozen" , bdev); -blkdev_put (bdev, mode); +blkdev_put (bdev, fc->fs_type);return -EBUSY ; }
@@ -1288,7 +1288,7 @@ int get_tree_bdev(struct fs_context *fc, s =sget_fc (fc, test_bdev_super_fc, set_bdev_super_fc);mutex_unlock (&bdev->bd_fsfreeze_mutex);if (IS_ERR (s)) { -blkdev_put (bdev, mode); +blkdev_put (bdev, fc->fs_type);return PTR_ERR (s); }
@@ -1297,7 +1297,7 @@ int get_tree_bdev(struct fs_context *fc,if ((fc->sb_flags ^ s->s_flags) &SB_RDONLY ) {warnf (fc,"%pg: Can't mount, would change RO state" , bdev);deactivate_locked_super (s); -blkdev_put (bdev, mode); +blkdev_put (bdev, fc->fs_type);return -EBUSY ; }
@@ -1309,7 +1309,7 @@ int get_tree_bdev(struct fs_context *fc,* holding an active reference. */ up_write (&s->s_umount); -blkdev_put (bdev, mode); +blkdev_put (bdev, fc->fs_type);down_write (&s->s_umount); }else { s->s_mode = mode;
@@ -1344,7 +1344,7 @@ struct dentry *mount_bdev(struct file_system_type *fs_type, {struct block_device *bdev;struct super_block *s; -fmode_t mode =FMODE_READ |FMODE_EXCL ; +fmode_t mode =FMODE_READ ;int error =0 ;if (!(flags &SB_RDONLY ))
@@ -1386,7 +1386,7 @@ struct dentry *mount_bdev(struct file_system_type *fs_type,* holding an active reference. */ up_write (&s->s_umount); -blkdev_put (bdev, mode); +blkdev_put (bdev, fs_type);down_write (&s->s_umount); }else { s->s_mode = mode;
@@ -1409,7 +1409,7 @@ struct dentry *mount_bdev(struct file_system_type *fs_type, error_s: error =PTR_ERR (s); error_bdev: -blkdev_put (bdev, mode); +blkdev_put (bdev, fs_type); error:return ERR_PTR (error); }
@@ -1418,13 +1418,11 @@ EXPORT_SYMBOL(mount_bdev);void kill_block_super (struct super_block *sb) {struct block_device *bdev = sb->s_bdev; -fmode_t mode = sb->s_mode; bdev->bd_super =NULL ;generic_shutdown_super (sb);sync_blockdev (bdev); -WARN_ON_ONCE (!(mode &FMODE_EXCL )); -blkdev_put (bdev, mode |FMODE_EXCL ); +blkdev_put (bdev, sb->s_type); }EXPORT_SYMBOL (kill_block_super);
fs/xfs/xfs_super.c +8 -7
@@ -396,8 +396,8 @@ xfs_blkdev_get( {int error =0 ; - *bdevp =blkdev_get_by_path (name,FMODE_READ |FMODE_WRITE |FMODE_EXCL , - mp, &xfs_holder_ops); + *bdevp =blkdev_get_by_path (name,FMODE_READ |FMODE_WRITE , mp, + &xfs_holder_ops);if (IS_ERR (*bdevp)) { error =PTR_ERR (*bdevp);xfs_warn (mp,"Invalid device [%s], error=%d" , name, error);
@@ -408,10 +408,11 @@ xfs_blkdev_get( STATIC voidxfs_blkdev_put ( +struct xfs_mount *mp,struct block_device *bdev) {if (bdev) -blkdev_put (bdev,FMODE_READ |FMODE_WRITE |FMODE_EXCL ); +blkdev_put (bdev, mp); }STATIC void
@@ -422,13 +423,13 @@ xfs_close_devices(struct block_device *logdev = mp->m_logdev_targp->bt_bdev;xfs_free_buftarg (mp->m_logdev_targp); -xfs_blkdev_put (logdev); +xfs_blkdev_put (mp, logdev); }if (mp->m_rtdev_targp) {struct block_device *rtdev = mp->m_rtdev_targp->bt_bdev;xfs_free_buftarg (mp->m_rtdev_targp); -xfs_blkdev_put (rtdev); +xfs_blkdev_put (mp, rtdev); }xfs_free_buftarg (mp->m_ddev_targp); }
@@ -503,10 +504,10 @@ xfs_open_devices( out_free_ddev_targ:xfs_free_buftarg (mp->m_ddev_targp); out_close_rtdev: -xfs_blkdev_put (rtdev); +xfs_blkdev_put (mp, rtdev); out_close_logdev:if (logdev && logdev != ddev) -xfs_blkdev_put (logdev); +xfs_blkdev_put (mp, logdev);return error; }
include/linux/blkdev.h +1 -1
@@ -1480,7 +1480,7 @@ struct block_device *blkdev_get_by_path(const char *path, fmode_t mode,int bd_prepare_to_claim (struct block_device *bdev,void *holder,const struct blk_holder_ops *hops);void bd_abort_claiming (struct block_device *bdev,void *holder); -void blkdev_put (struct block_device *bdev,fmode_t mode); +void blkdev_put (struct block_device *bdev,void *holder);/* just for blk-cgroup, don't use elsewhere */ struct block_device *blkdev_get_no_open (dev_t dev);
kernel/power/hibernate.c +4 -8
@@ -688,22 +688,18 @@ static int load_image_and_restore(bool snapshot_test) {int error;unsigned int flags; -fmode_t mode =FMODE_READ ; - -if (snapshot_test) - mode |=FMODE_EXCL ;pm_pr_dbg ("Loading hibernation image.\n" );lock_device_hotplug (); error =create_basic_memory_bitmaps ();if (error) { -swsusp_close (mode); +swsusp_close (snapshot_test); goto Unlock; } error =swsusp_read (&flags); -swsusp_close (mode); +swsusp_close (snapshot_test);if (!error) error =hibernation_restore (flags &SF_PLATFORM_MODE );
@@ -956,7 +952,7 @@ static int software_resume(void)/* The snapshot device should not be opened while we're running */ if (!hibernate_acquire ()) { error = -EBUSY ; -swsusp_close (FMODE_READ |FMODE_EXCL ); +swsusp_close (false); goto Unlock; }
@@ -991,7 +987,7 @@ static int software_resume(void)pm_pr_dbg ("Hibernation image not present or could not be loaded.\n" );return error; Close_Finish: -swsusp_close (FMODE_READ |FMODE_EXCL ); +swsusp_close (false); goto Finish; }
kernel/power/power.h +1 -1
@@ -177,7 +177,7 @@ int swsusp_check(bool snapshot_test);extern void swsusp_free (void );extern int swsusp_read (unsigned int *flags_p);extern int swsusp_write (unsigned int flags); -extern void swsusp_close (fmode_t ); +void swsusp_close (bool snapshot_test);#ifdef CONFIG_SUSPEND extern int swsusp_unmark (void );#endif
kernel/power/swap.c +9 -12
@@ -363,7 +363,7 @@ static int swsusp_swap_check(void) res =set_blocksize (hib_resume_bdev,PAGE_SIZE );if (res <0 ) -blkdev_put (hib_resume_bdev,FMODE_WRITE ); +blkdev_put (hib_resume_bdev,NULL );return res; }
@@ -443,7 +443,7 @@ static int get_swap_writer(struct swap_map_handle *handle) err_rel:release_swap_writer (handle); err_close: -swsusp_close (FMODE_WRITE ); +swsusp_close (false);return ret; }
@@ -508,7 +508,7 @@ static int swap_writer_finish(struct swap_map_handle *handle,if (error)free_all_swap_pages (root_swap);release_swap_writer (handle); -swsusp_close (FMODE_WRITE ); +swsusp_close (false);return error; }
@@ -1518,14 +1518,11 @@ static void *swsusp_holder;int swsusp_check (bool snapshot_test) { +void *holder = snapshot_test ? &swsusp_holder :NULL ;int error; -fmode_t mode =FMODE_READ ; -if (snapshot_test) - mode |=FMODE_EXCL ; - - hib_resume_bdev =blkdev_get_by_dev (swsusp_resume_device, - mode, &swsusp_holder,NULL ); + hib_resume_bdev =blkdev_get_by_dev (swsusp_resume_device,FMODE_READ , + holder,NULL );if (!IS_ERR (hib_resume_bdev)) {set_blocksize (hib_resume_bdev,PAGE_SIZE );clear_page (swsusp_header);
@@ -1552,7 +1549,7 @@ int swsusp_check(bool snapshot_test) put:if (error) -blkdev_put (hib_resume_bdev, mode); +blkdev_put (hib_resume_bdev, holder);else pr_debug ("Image signature found, resuming\n" ); }else {
@@ -1569,14 +1566,14 @@ int swsusp_check(bool snapshot_test)* swsusp_close - close swap device. */ -void swsusp_close (fmode_t mode) +void swsusp_close (bool snapshot_test) {if (IS_ERR (hib_resume_bdev)) {pr_debug ("Image device not initialised\n" );return ; } -blkdev_put (hib_resume_bdev, mode); +blkdev_put (hib_resume_bdev, snapshot_test ? &swsusp_holder :NULL ); }/**
mm/swapfile.c +3 -4
@@ -2539,7 +2539,7 @@ SYSCALL_DEFINE1(swapoff, const char __user *, specialfile)struct block_device *bdev =I_BDEV (inode);set_blocksize (bdev, old_block_size); -blkdev_put (bdev,FMODE_READ |FMODE_WRITE |FMODE_EXCL ); +blkdev_put (bdev, p); }inode_lock (inode);
@@ -2770,8 +2770,7 @@ static int claim_swapfile(struct swap_info_struct *p, struct inode *inode)if (S_ISBLK (inode->i_mode)) { p->bdev =blkdev_get_by_dev (inode->i_rdev, -FMODE_READ |FMODE_WRITE |FMODE_EXCL , p, -NULL ); +FMODE_READ |FMODE_WRITE , p,NULL );if (IS_ERR (p->bdev)) { error =PTR_ERR (p->bdev); p->bdev =NULL ;
@@ -3222,7 +3221,7 @@ SYSCALL_DEFINE2(swapon, const char __user *, specialfile, int, swap_flags) p->cluster_next_cpu =NULL ;if (inode &&S_ISBLK (inode->i_mode) && p->bdev) {set_blocksize (p->bdev, p->old_block_size); -blkdev_put (p->bdev,FMODE_READ |FMODE_WRITE |FMODE_EXCL ); +blkdev_put (p->bdev, p); } inode =NULL ;destroy_swap_extents (p);
Signature · 1 line
2.39.2
Re: [PATCH 16/31] block: use the holder as indication for exclusive opens
Quoted 10 lines · Christoph Hellwig
The current interface for exclusive opens is rather confusing as it requires both the
FMODE_EXCLflag and a holder. Remove the need to passFMODE_EXCLand just key off the exclusive open off a non-NULL holder.For
blkdev_putthis requires adding the holder argument, which provides better debug checking that only the holder actually releases the hold, but at the same time allows removing the now superfluous mode argument.Signed-off-by Christoph Hellwig <[email protected]>---
Looks good to me,
Re: [PATCH 16/31] block: use the holder as indication for exclusive opens
In reply to Christoph HellwigQuoted 10 lines · On Tue, Jun 6, 2023 at 9:40 AM Christoph Hellwig <[email protected]> wrote:
The current interface for exclusive opens is rather confusing as it requires both the
FMODE_EXCLflag and a holder. Remove the need to passFMODE_EXCLand just key off the exclusive open off a non-NULL holder.For
blkdev_putthis requires adding the holder argument, which provides better debug checking that only the holder actually releases the hold, but at the same time allows removing the now superfluous mode argument.Signed-off-by Christoph Hellwig <[email protected]>
Quoted 8 lines
--- block/bdev.c | 37 ++++++++++++++++------------ block/fops.c | 6 +++-- block/genhd.c | 5 ++-- block/ioctl.c | 5 ++-- drivers/block/drbd/drbd_nl.c | 23 ++++++++++------- drivers/block/pktcdvd.c | 13 +++++----- drivers/block/rnbd/rnbd-srv.c | 4 +--
Re: [PATCH 16/31] block: use the holder as indication for exclusive opens
In reply to Christoph HellwigQuoted 40 lines · Christoph Hellwig
The current interface for exclusive opens is rather confusing as it requires both the
FMODE_EXCLflag and a holder. Remove the need to passFMODE_EXCLand just key off the exclusive open off a non-NULL holder.For
blkdev_putthis requires adding the holder argument, which provides better debug checking that only the holder actually releases the hold, but at the same time allows removing the now superfluous mode argument.Signed-off-by Christoph Hellwig <[email protected]>--- block/bdev.c | 37 ++++++++++++++++------------ block/fops.c | 6 +++-- block/genhd.c | 5 ++-- block/ioctl.c | 5 ++-- drivers/block/drbd/drbd_nl.c | 23 ++++++++++------- drivers/block/pktcdvd.c | 13 +++++----- drivers/block/rnbd/rnbd-srv.c | 4 +-- drivers/block/xen-blkback/xenbus.c | 2 +- drivers/block/zram/zram_drv.c | 8 +++--- drivers/md/bcache/super.c | 15 ++++++------ drivers/md/dm.c | 6 ++--- drivers/md/md.c | 38 +++++++++++++++-------------- drivers/mtd/devices/block2mtd.c | 4 +-- drivers/nvme/target/io-cmd-bdev.c | 2 +- drivers/s390/block/dasd_genhd.c | 2 +- drivers/target/target_core_iblock.c | 6 ++--- drivers/target/target_core_pscsi.c | 8 +++--- fs/btrfs/dev-replace.c | 6 ++--- fs/btrfs/ioctl.c | 12 ++++----- fs/btrfs/volumes.c | 28 ++++++++++----------- fs/btrfs/volumes.h | 6 ++--- fs/erofs/super.c | 7 +++--- fs/ext4/super.c | 11 +++------ fs/f2fs/super.c | 2 +- fs/jfs/jfs_logmgr.c | 6 ++--- fs/nfs/blocklayout/dev.c | 4 +-- fs/nilfs2/super.c | 6 ++--- fs/ocfs2/cluster/heartbeat.c | 4 +-- fs/reiserfs/journal.c | 19 +++++++-------- fs/reiserfs/reiserfs.h | 1 -
Quoted 9 lines
fs/super.c | 20 +++++++-------- fs/xfs/xfs_super.c | 15 ++++++------ include/linux/blkdev.h | 2 +- kernel/power/hibernate.c | 12 +++------ kernel/power/power.h | 2 +- kernel/power/swap.c | 21 +++++++--------- mm/swapfile.c | 7 +++--- 37 files changed, 183 insertions(+), 192 deletions(-)
Cheers,
Hannes
Re: [PATCH 16/31] block: use the holder as indication for exclusive opens
In reply to Christoph HellwigQuoted 19 lines · Christoph Hellwig
The current interface for exclusive opens is rather confusing as it requires both the
FMODE_EXCLflag and a holder. Remove the need to passFMODE_EXCLand just key off the exclusive open off a non-NULL holder.For
blkdev_putthis requires adding the holder argument, which provides better debug checking that only the holder actually releases the hold, but at the same time allows removing the now superfluous mode argument.Signed-off-by Christoph Hellwig <[email protected]>--- block/bdev.c | 37 ++++++++++++++++------------ block/fops.c | 6 +++-- block/genhd.c | 5 ++-- block/ioctl.c | 5 ++-- drivers/block/drbd/drbd_nl.c | 23 ++++++++++------- drivers/block/pktcdvd.c | 13 +++++----- drivers/block/rnbd/rnbd-srv.c | 4 +-- drivers/block/xen-blkback/xenbus.c | 2 +- drivers/block/zram/zram_drv.c | 8 +++---
Quoted 8 lines
drivers/md/bcache/super.c | 15 ++++++------ drivers/md/dm.c | 6 ++--- drivers/md/md.c | 38 +++++++++++++++-------------- drivers/mtd/devices/block2mtd.c | 4 +-- drivers/nvme/target/io-cmd-bdev.c | 2 +- drivers/s390/block/dasd_genhd.c | 2 +- drivers/target/target_core_iblock.c | 6 ++--- drivers/target/target_core_pscsi.c | 8 +++---
For
Quoted 4 lines
fs/btrfs/dev-replace.c | 6 ++--- fs/btrfs/ioctl.c | 12 ++++----- fs/btrfs/volumes.c | 28 ++++++++++----------- fs/btrfs/volumes.h | 6 ++---
Christoph Hellwig
maintainerPATCH 17/31 block: add a sb_open_mode helper
In reply to Christoph HellwigAdd a helper to return the open flags for blkdev_get_by* for passed in super block flags instead of open coding the logic in many places.
--- fs/btrfs/super.c | 5 +---- fs/nilfs2/super.c | 7 ++----- fs/super.c | 15 ++++----------- include/linux/blkdev.h | 7 +++++++ 4 files changed, 14 insertions(+), 20 deletions(-)
fs/btrfs/super.c +1 -4
@@ -1440,12 +1440,9 @@ static struct dentry *btrfs_mount_root(struct file_system_type *fs_type,struct btrfs_fs_devices *fs_devices =NULL ;struct btrfs_fs_info *fs_info =NULL ;void *new_sec_opts =NULL ; -fmode_t mode =FMODE_READ ; +fmode_t mode =sb_open_mode (flags);int error =0 ; -if (!(flags &SB_RDONLY )) - mode |=FMODE_WRITE ; -if (data) { error =security_sb_eat_lsm_opts (data, &new_sec_opts);if (error)
fs/nilfs2/super.c +2 -5
@@ -1278,14 +1278,11 @@ nilfs_mount(struct file_system_type *fs_type, int flags, {struct nilfs_super_data sd;struct super_block *s; -fmode_t mode =FMODE_READ ;struct dentry *root_dentry;int err, s_new = false; -if (!(flags &SB_RDONLY )) - mode |=FMODE_WRITE ; - - sd.bdev =blkdev_get_by_path (dev_name, mode, fs_type,NULL ); + sd.bdev =blkdev_get_by_path (dev_name,sb_open_mode (flags), fs_type, +NULL );if (IS_ERR (sd.bdev))return ERR_CAST (sd.bdev);
fs/super.c +4 -11
@@ -1255,17 +1255,13 @@ int get_tree_bdev(struct fs_context *fc, {struct block_device *bdev;struct super_block *s; -fmode_t mode =FMODE_READ ;int error =0 ; -if (!(fc->sb_flags &SB_RDONLY )) - mode |=FMODE_WRITE ; -if (!fc->source)return invalf (fc,"No source specified" ); - bdev =blkdev_get_by_path (fc->source, mode, fc->fs_type, - &fs_holder_ops); + bdev =blkdev_get_by_path (fc->source,sb_open_mode (fc->sb_flags), + fc->fs_type, &fs_holder_ops);if (IS_ERR (bdev)) {errorf (fc,"%s: Can't open blockdev" , fc->source);return PTR_ERR (bdev);
@@ -1344,13 +1340,10 @@ struct dentry *mount_bdev(struct file_system_type *fs_type, {struct block_device *bdev;struct super_block *s; -fmode_t mode =FMODE_READ ;int error =0 ; -if (!(flags &SB_RDONLY )) - mode |=FMODE_WRITE ; - - bdev =blkdev_get_by_path (dev_name, mode, fs_type, &fs_holder_ops); + bdev =blkdev_get_by_path (dev_name,sb_open_mode (flags), fs_type, + &fs_holder_ops);if (IS_ERR (bdev))return ERR_CAST (bdev);
include/linux/blkdev.h +7 -0
@@ -1473,6 +1473,13 @@ struct blk_holder_ops {void (*mark_dead)(struct block_device *bdev); }; +/* +* Return the correct open flags for blkdev_get_by_* for super block flags +* as stored in sb->s_flags. +*/ +#define sb_open_mode (flags) \ + (FMODE_READ | (((flags) & SB_RDONLY) ? 0 : FMODE_WRITE)) +struct block_device *blkdev_get_by_dev (dev_t dev,fmode_t mode,void *holder,const struct blk_holder_ops *hops); struct block_device *blkdev_get_by_path(const char *path, fmode_t mode,
Signature · 1 line
2.39.2
Re: [PATCH 17/31] block: add a sb_open_mode helper
Quoted 5 lines · Christoph Hellwig
Add a helper to return the open flags for blkdev_get_by* for passed in super block flags instead of open coding the logic in many places.
Signed-off-by Christoph Hellwig <[email protected]>---
Looks good to me,
Re: [PATCH 17/31] block: add a sb_open_mode helper
In reply to Christoph HellwigQuoted 11 lines · Christoph Hellwig
Add a helper to return the open flags for blkdev_get_by* for passed in super block flags instead of open coding the logic in many places.
Signed-off-by Christoph Hellwig <[email protected]>--- fs/btrfs/super.c | 5 +---- fs/nilfs2/super.c | 7 ++----- fs/super.c | 15 ++++----------- include/linux/blkdev.h | 7 +++++++ 4 files changed, 14 insertions(+), 20 deletions(-)
Cheers,
Hannes
Christoph Hellwig
maintainerPATCH 18/31 fs: remove sb->s_mode
In reply to Christoph HellwigThere is no real need to store the open mode in the super_block now. It is only used by f2fs, which can easily recalculate it.
--- fs/f2fs/super.c | 10 ++++++---- fs/nilfs2/super.c | 1 - fs/super.c | 2 -- include/linux/fs.h | 1 - 4 files changed, 6 insertions(+), 8 deletions(-)
fs/f2fs/super.c +6 -4
@@ -3993,6 +3993,7 @@ static int f2fs_scan_devices(struct f2fs_sb_info *sbi)struct f2fs_super_block *raw_super =F2FS_RAW_SUPER (sbi);unsigned int max_devices =MAX_DEVICES ;unsigned int logical_blksize; +fmode_t mode =sb_open_mode (sbi->sb->s_flags);int i;/* Initialize single device information */
@@ -4024,8 +4025,8 @@ static int f2fs_scan_devices(struct f2fs_sb_info *sbi)if (max_devices ==1 ) {/* Single zoned block device mount */ FDEV (0 ).bdev = -blkdev_get_by_dev (sbi->sb->s_bdev->bd_dev, - sbi->sb->s_mode, sbi->sb->s_type,NULL ); +blkdev_get_by_dev (sbi->sb->s_bdev->bd_dev, mode, + sbi->sb->s_type,NULL ); }else {/* Multi-device mount */ memcpy (FDEV (i).path,RDEV (i).path,MAX_PATH_LEN );
@@ -4043,8 +4044,9 @@ static int f2fs_scan_devices(struct f2fs_sb_info *sbi) (FDEV (i).total_segments << sbi->log_blocks_per_seg) -1 ; } -FDEV (i).bdev =blkdev_get_by_path (FDEV (i).path, - sbi->sb->s_mode, sbi->sb->s_type,NULL ); +FDEV (i).bdev =blkdev_get_by_path (FDEV (i).path, mode, + sbi->sb->s_type, +NULL ); }if (IS_ERR (FDEV (i).bdev))return PTR_ERR (FDEV (i).bdev);
fs/nilfs2/super.c +0 -1
@@ -1316,7 +1316,6 @@ nilfs_mount(struct file_system_type *fs_type, int flags, s_new = true;/* New superblock instance created */ - s->s_mode = mode;snprintf (s->s_id,sizeof (s->s_id),"%pg" , sd.bdev);sb_set_blocksize (s,block_size (sd.bdev));
fs/super.c +0 -2
@@ -1308,7 +1308,6 @@ int get_tree_bdev(struct fs_context *fc,blkdev_put (bdev, fc->fs_type);down_write (&s->s_umount); }else { - s->s_mode = mode;snprintf (s->s_id,sizeof (s->s_id),"%pg" , bdev);shrinker_debugfs_rename (&s->s_shrink,"sb-%s:%s" , fc->fs_type->name, s->s_id);
@@ -1382,7 +1381,6 @@ struct dentry *mount_bdev(struct file_system_type *fs_type,blkdev_put (bdev, fs_type);down_write (&s->s_umount); }else { - s->s_mode = mode;snprintf (s->s_id,sizeof (s->s_id),"%pg" , bdev);shrinker_debugfs_rename (&s->s_shrink,"sb-%s:%s" , fs_type->name, s->s_id);
include/linux/fs.h +0 -1
@@ -1215,7 +1215,6 @@ struct super_block {uuid_t s_uuid;/* UUID */ unsigned int s_max_links; -fmode_t s_mode;/* * The next field is for VFS *only*. No filesystems have any business
Signature · 1 line
2.39.2
Re: [PATCH 18/31] fs: remove sb->s_mode
Quoted 5 lines · Christoph Hellwig
There is no real need to store the open mode in the
super_blocknow. It is only used by f2fs, which can easily recalculate it.Signed-off-by Christoph Hellwig <[email protected]>---
Looks good to me,
Re: [PATCH 18/31] fs: remove sb->s_mode
In reply to Christoph HellwigQuoted 11 lines · Christoph Hellwig
There is no real need to store the open mode in the
super_blocknow. It is only used by f2fs, which can easily recalculate it.Signed-off-by Christoph Hellwig <[email protected]>--- fs/f2fs/super.c | 10 ++++++---- fs/nilfs2/super.c | 1 - fs/super.c | 2 -- include/linux/fs.h | 1 - 4 files changed, 6 insertions(+), 8 deletions(-)
Cheers,
Hannes
Christoph Hellwig
maintainerPATCH 19/31 scsi: replace the fmode_t argument to scsi_cmd_allowed with a simple bool
In reply to Christoph HellwigInstead of passing a fmode_t and only checking it for FMODE_WRITE, pass a bool open_for_write to prepare for callers that won't have the fmode_t.
--- drivers/scsi/scsi_bsg.c | 2 +- drivers/scsi/scsi_ioctl.c | 8 ++++---- drivers/scsi/sg.c | 2 +- include/scsi/scsi_ioctl.h | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-)
drivers/scsi/scsi_bsg.c +1 -1
@@ -42,7 +42,7 @@ static int scsi_bsg_sg_io_fn(struct request_queue *q, struct sg_io_v4 *hdr,if (copy_from_user (scmd->cmnd,uptr64 (hdr->request), scmd->cmd_len)) goto out_put_request; ret = -EPERM ; -if (!scsi_cmd_allowed (scmd->cmnd, mode)) +if (!scsi_cmd_allowed (scmd->cmnd, mode &FMODE_WRITE )) goto out_put_request; ret =0 ;
drivers/scsi/scsi_ioctl.c +4 -4
@@ -248,7 +248,7 @@ static int scsi_send_start_stop(struct scsi_device *sdev, int data)* Only a subset of commands are allowed for unprivileged users. Commands used * to format the media, update the firmware, etc. are not permitted. */ -bool scsi_cmd_allowed (unsigned char *cmd,fmode_t mode) +bool scsi_cmd_allowed (unsigned char *cmd,bool open_for_write) {/* root can do any command. */ if (capable (CAP_SYS_RAWIO ))
@@ -338,7 +338,7 @@ bool scsi_cmd_allowed(unsigned char *cmd, fmode_t mode)case GPCMD_SET_READ_AHEAD :/* ZBC */ case ZBC_OUT : -return (mode &FMODE_WRITE ); +return open_for_write;default :return false; }
@@ -354,7 +354,7 @@ static int scsi_fill_sghdr_rq(struct scsi_device *sdev, struct request *rq,return -EMSGSIZE ;if (copy_from_user (scmd->cmnd, hdr->cmdp, hdr->cmd_len))return -EFAULT ; -if (!scsi_cmd_allowed (scmd->cmnd, mode)) +if (!scsi_cmd_allowed (scmd->cmnd, mode &FMODE_WRITE ))return -EPERM ; scmd->cmd_len = hdr->cmd_len;
@@ -554,7 +554,7 @@ static int sg_scsi_ioctl(struct request_queue *q, fmode_t mode, goto error; err = -EPERM ; -if (!scsi_cmd_allowed (scmd->cmnd, mode)) +if (!scsi_cmd_allowed (scmd->cmnd, mode &FMODE_WRITE )) goto error;/* default. possible overridden later */
drivers/scsi/sg.c +1 -1
@@ -237,7 +237,7 @@ static int sg_allow_access(struct file *filp, unsigned char *cmd)if (sfp->parentdp->device->type ==TYPE_SCANNER )return 0 ; -if (!scsi_cmd_allowed (cmd, filp->f_mode)) +if (!scsi_cmd_allowed (cmd, filp->f_mode &FMODE_WRITE ))return -EPERM ;return 0 ; }
include/scsi/scsi_ioctl.h +1 -1
@@ -49,7 +49,7 @@ int scsi_ioctl(struct scsi_device *sdev, fmode_t mode, int cmd, void __user *arg);int get_sg_io_hdr (struct sg_io_hdr *hdr,const void __user *argp);int put_sg_io_hdr (const struct sg_io_hdr *hdr,void __user *argp); -bool scsi_cmd_allowed (unsigned char *cmd,fmode_t mode); +bool scsi_cmd_allowed (unsigned char *cmd,bool open_for_write);#endif /* __KERNEL__ */ #endif /* _SCSI_IOCTL_H */
Signature · 1 line
2.39.2
Re: [PATCH 19/31] scsi: replace the fmode_t argument to scsi_cmd_allowed with a simple bool
Quoted 5 lines · Christoph Hellwig
Instead of passing a
fmode_tand only checking it forFMODE_WRITE, pass a boolopen_for_writeto prepare for callers that won't have thefmode_t.Signed-off-by Christoph Hellwig <[email protected]>---
Looks good to me,
Re: [PATCH 19/31] scsi: replace the fmode_t argument to scsi_cmd_allowed with a simple bool
In reply to Christoph HellwigQuoted 11 lines · Christoph Hellwig
Instead of passing a
fmode_tand only checking it forFMODE_WRITE, pass a boolopen_for_writeto prepare for callers that won't have thefmode_t.Signed-off-by Christoph Hellwig <[email protected]>--- drivers/scsi/scsi_bsg.c | 2 +- drivers/scsi/scsi_ioctl.c | 8 ++++---- drivers/scsi/sg.c | 2 +- include/scsi/scsi_ioctl.h | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-)
Cheers,
Hannes
Re: [PATCH 19/31] scsi: replace the fmode_t argument to scsi_cmd_allowed with a simple bool
In reply to Christoph HellwigChristoph,
Quoted 2 lines
Instead of passing a
fmode_tand only checking it forFMODE_WRITE, pass a boolopen_for_writeto prepare for callers that won't have thefmode_t.
Signature · 1 line
Martin K. Petersen Oracle Linux Engineering
Christoph Hellwig
maintainerPATCH 20/31 scsi: replace the fmode_t argument to scsi_ioctl with a simple bool
In reply to Christoph HellwigInstead of passing a fmode_t and only checking it for FMODE_WRITE, pass a bool open_for_write to prepare for callers that won't have the fmode_t.
--- drivers/scsi/ch.c | 3 ++- drivers/scsi/scsi_ioctl.c | 34 +++++++++++++++++----------------- drivers/scsi/sd.c | 2 +- drivers/scsi/sg.c | 5 +++-- drivers/scsi/sr.c | 2 +- drivers/scsi/st.c | 2 +- include/scsi/scsi_ioctl.h | 2 +- 7 files changed, 26 insertions(+), 24 deletions(-)
drivers/scsi/ch.c +2 -1
@@ -877,7 +877,8 @@ static long ch_ioctl(struct file *file, }default : -return scsi_ioctl (ch->device, file->f_mode, cmd, argp); +return scsi_ioctl (ch->device, file->f_mode &FMODE_WRITE , cmd, + argp); } }
drivers/scsi/scsi_ioctl.c +17 -17
@@ -346,7 +346,7 @@ bool scsi_cmd_allowed(unsigned char *cmd, bool open_for_write)EXPORT_SYMBOL (scsi_cmd_allowed);static int scsi_fill_sghdr_rq (struct scsi_device *sdev,struct request *rq, -struct sg_io_hdr *hdr,fmode_t mode) +struct sg_io_hdr *hdr,bool open_for_write) {struct scsi_cmnd *scmd =blk_mq_rq_to_pdu (rq);
@@ -354,7 +354,7 @@ static int scsi_fill_sghdr_rq(struct scsi_device *sdev, struct request *rq,return -EMSGSIZE ;if (copy_from_user (scmd->cmnd, hdr->cmdp, hdr->cmd_len))return -EFAULT ; -if (!scsi_cmd_allowed (scmd->cmnd, mode &FMODE_WRITE )) +if (!scsi_cmd_allowed (scmd->cmnd, open_for_write))return -EPERM ; scmd->cmd_len = hdr->cmd_len;
@@ -407,7 +407,8 @@ static int scsi_complete_sghdr_rq(struct request *rq, struct sg_io_hdr *hdr,return ret; } -static int sg_io (struct scsi_device *sdev,struct sg_io_hdr *hdr,fmode_t mode) +static int sg_io (struct scsi_device *sdev,struct sg_io_hdr *hdr, +bool open_for_write) {unsigned long start_time;ssize_t ret =0 ;
@@ -448,7 +449,7 @@ static int sg_io(struct scsi_device *sdev, struct sg_io_hdr *hdr, fmode_t mode) goto out_put_request; } - ret =scsi_fill_sghdr_rq (sdev, rq, hdr, mode); + ret =scsi_fill_sghdr_rq (sdev, rq, hdr, open_for_write);if (ret <0 ) goto out_put_request;
@@ -477,8 +478,7 @@ static int sg_io(struct scsi_device *sdev, struct sg_io_hdr *hdr, fmode_t mode)/** * sg_scsi_ioctl -- handle deprecated SCSI_IOCTL_SEND_COMMAND ioctl * @q: request queue to send scsi commands down -* @mode: mode used to open the file through which the ioctl has been -* submitted +* @open_for_write: is the file / block device opened for writing? * @sic: userspace structure describing the command to perform * * Send down the scsi command described by @sic to the device below
@@ -501,7 +501,7 @@ static int sg_io(struct scsi_device *sdev, struct sg_io_hdr *hdr, fmode_t mode)* Positive numbers returned are the compacted SCSI error codes (4 * bytes in one int) where the lowest byte is the SCSI status. */ -static int sg_scsi_ioctl (struct request_queue *q,fmode_t mode, +static int sg_scsi_ioctl (struct request_queue *q,bool open_for_write,struct scsi_ioctl_command __user *sic) {struct request *rq;
@@ -554,7 +554,7 @@ static int sg_scsi_ioctl(struct request_queue *q, fmode_t mode, goto error; err = -EPERM ; -if (!scsi_cmd_allowed (scmd->cmnd, mode &FMODE_WRITE )) +if (!scsi_cmd_allowed (scmd->cmnd, open_for_write)) goto error;/* default. possible overridden later */
@@ -776,7 +776,7 @@ static int scsi_put_cdrom_generic_arg(const struct cdrom_generic_command *cgc,return 0 ; } -static int scsi_cdrom_send_packet (struct scsi_device *sdev,fmode_t mode, +static int scsi_cdrom_send_packet (struct scsi_device *sdev,bool open_for_write,void __user *arg) {struct cdrom_generic_command cgc;
@@ -817,7 +817,7 @@ static int scsi_cdrom_send_packet(struct scsi_device *sdev, fmode_t mode, hdr.cmdp = ((struct cdrom_generic_command __user *) arg)->cmd; hdr.cmd_len =sizeof (cgc.cmd); - err =sg_io (sdev, &hdr, mode); + err =sg_io (sdev, &hdr, open_for_write);if (err == -EFAULT )return -EFAULT ;
@@ -832,7 +832,7 @@ static int scsi_cdrom_send_packet(struct scsi_device *sdev, fmode_t mode,return err; } -static int scsi_ioctl_sg_io (struct scsi_device *sdev,fmode_t mode, +static int scsi_ioctl_sg_io (struct scsi_device *sdev,bool open_for_write,void __user *argp) {struct sg_io_hdr hdr;
@@ -841,7 +841,7 @@ static int scsi_ioctl_sg_io(struct scsi_device *sdev, fmode_t mode, error =get_sg_io_hdr (&hdr, argp);if (error)return error; - error =sg_io (sdev, &hdr, mode); + error =sg_io (sdev, &hdr, open_for_write);if (error == -EFAULT )return error;if (put_sg_io_hdr (&hdr, argp))
@@ -852,7 +852,7 @@ static int scsi_ioctl_sg_io(struct scsi_device *sdev, fmode_t mode,/** * scsi_ioctl - Dispatch ioctl to scsi device * @sdev: scsi device receiving ioctl -* @mode: mode the block/char device is opened with +* @open_for_write: is the file / block device opened for writing? * @cmd: which ioctl is it * @arg: data associated with ioctl *
@@ -860,7 +860,7 @@ static int scsi_ioctl_sg_io(struct scsi_device *sdev, fmode_t mode,* does not take a major/minor number as the dev field. Rather, it takes * a pointer to a &struct scsi_device. */ -int scsi_ioctl (struct scsi_device *sdev,fmode_t mode,int cmd, +int scsi_ioctl (struct scsi_device *sdev,bool open_for_write,int cmd,void __user *arg) {struct request_queue *q = sdev->request_queue;
@@ -896,11 +896,11 @@ int scsi_ioctl(struct scsi_device *sdev, fmode_t mode, int cmd,case SG_EMULATED_HOST :return sg_emulated_host (q, arg);case SG_IO : -return scsi_ioctl_sg_io (sdev, mode, arg); +return scsi_ioctl_sg_io (sdev, open_for_write, arg);case SCSI_IOCTL_SEND_COMMAND : -return sg_scsi_ioctl (q, mode, arg); +return sg_scsi_ioctl (q, open_for_write, arg);case CDROM_SEND_PACKET : -return scsi_cdrom_send_packet (sdev, mode, arg); +return scsi_cdrom_send_packet (sdev, open_for_write, arg);case CDROMCLOSETRAY :return scsi_send_start_stop (sdev,3 );case CDROMEJECT :
drivers/scsi/sd.c +1 -1
@@ -1463,7 +1463,7 @@ static int sd_ioctl(struct block_device *bdev, fmode_t mode,if (is_sed_ioctl (cmd))return sed_ioctl (sdkp->opal_dev, cmd, p); -return scsi_ioctl (sdp, mode, cmd, p); +return scsi_ioctl (sdp, mode &FMODE_WRITE , cmd, p); }static void set_media_not_present (struct scsi_disk *sdkp)
drivers/scsi/sg.c +3 -2
@@ -1103,7 +1103,8 @@ sg_ioctl_common(struct file *filp, Sg_device *sdp, Sg_fd *sfp,case SCSI_IOCTL_SEND_COMMAND :if (atomic_read (&sdp->detaching))return -ENODEV ; -return scsi_ioctl (sdp->device, filp->f_mode, cmd_in, p); +return scsi_ioctl (sdp->device, filp->f_mode &FMODE_WRITE , + cmd_in, p);case SG_SET_DEBUG : result =get_user (val, ip);if (result)
@@ -1159,7 +1160,7 @@ sg_ioctl(struct file *filp, unsigned int cmd_in, unsigned long arg) ret =sg_ioctl_common (filp, sdp, sfp, cmd_in, p);if (ret != -ENOIOCTLCMD )return ret; -return scsi_ioctl (sdp->device, filp->f_mode, cmd_in, p); +return scsi_ioctl (sdp->device, filp->f_mode &FMODE_WRITE , cmd_in, p); } static __poll_t
drivers/scsi/sr.c +1 -1
@@ -543,7 +543,7 @@ static int sr_block_ioctl(struct block_device *bdev, fmode_t mode, unsigned cmd,if (ret != -ENOSYS ) goto put; } - ret =scsi_ioctl (sdev, mode, cmd, argp); + ret =scsi_ioctl (sdev, mode &FMODE_WRITE , cmd, argp); put:scsi_autopm_put_device (sdev);
drivers/scsi/st.c +1 -1
@@ -3832,7 +3832,7 @@ static long st_ioctl(struct file *file, unsigned int cmd_in, unsigned long arg)break ; } - retval =scsi_ioctl (STp->device, file->f_mode, cmd_in, p); + retval =scsi_ioctl (STp->device, file->f_mode &FMODE_WRITE , cmd_in, p);if (!retval && cmd_in ==SCSI_IOCTL_STOP_UNIT ) {/* unload */ STp->rew_at_close =0 ;
include/scsi/scsi_ioctl.h +1 -1
@@ -45,7 +45,7 @@ typedef struct scsi_fctargaddress {int scsi_ioctl_block_when_processing_errors (struct scsi_device *sdev,int cmd,bool ndelay); -int scsi_ioctl (struct scsi_device *sdev,fmode_t mode,int cmd, +int scsi_ioctl (struct scsi_device *sdev,bool open_for_write,int cmd,void __user *arg);int get_sg_io_hdr (struct sg_io_hdr *hdr,const void __user *argp);int put_sg_io_hdr (const struct sg_io_hdr *hdr,void __user *argp);
Signature · 1 line
2.39.2
Re: [PATCH 20/31] scsi: replace the fmode_t argument to scsi_ioctl with a simple bool
Quoted 5 lines · Christoph Hellwig
Instead of passing a
fmode_tand only checking it forFMODE_WRITE, pass a boolopen_for_writeto prepare for callers that won't have thefmode_t.Signed-off-by Christoph Hellwig <[email protected]>---
Looks good to me,
Re: [PATCH 20/31] scsi: replace the fmode_t argument to scsi_ioctl with a simple bool
In reply to Christoph HellwigQuoted 4 lines · Christoph Hellwig
Instead of passing a
fmode_tand only checking it forFMODE_WRITE, pass a boolopen_for_writeto prepare for callers that won't have thefmode_t.Signed-off-by Christoph Hellwig <[email protected]>
Quoted 10 lines
--- drivers/scsi/ch.c | 3 ++- drivers/scsi/scsi_ioctl.c | 34 +++++++++++++++++----------------- drivers/scsi/sd.c | 2 +- drivers/scsi/sg.c | 5 +++-- drivers/scsi/sr.c | 2 +- drivers/scsi/st.c | 2 +- include/scsi/scsi_ioctl.h | 2 +- 7 files changed, 26 insertions(+), 24 deletions(-)
Cheers,
Hannes
Re: [PATCH 20/31] scsi: replace the fmode_t argument to scsi_ioctl with a simple bool
In reply to Christoph HellwigChristoph,
Quoted 2 lines
Instead of passing a
fmode_tand only checking it forFMODE_WRITE, pass a boolopen_for_writeto prepare for callers that won't have thefmode_t.
Signature · 1 line
Martin K. Petersen Oracle Linux Engineering
Christoph Hellwig
maintainerPATCH 21/31 scsi: replace the fmode_t argument to ->sg_io_fn with a simple bool
In reply to Christoph HellwigInstead of passing a fmode_t and only checking it for FMODE_WRITE, pass a bool open_for_write to prepare for callers that won't have the fmode_t.
--- block/bsg-lib.c | 2 +- block/bsg.c | 8 +++++--- drivers/scsi/scsi_bsg.c | 4 ++-- include/linux/bsg.h | 2 +- 4 files changed, 9 insertions(+), 7 deletions(-)
block/bsg-lib.c +1 -1
@@ -26,7 +26,7 @@ struct bsg_set { };static int bsg_transport_sg_io_fn (struct request_queue *q,struct sg_io_v4 *hdr, -fmode_t mode,unsigned int timeout) +bool open_for_write,unsigned int timeout) {struct bsg_job *job;struct request *rq;
block/bsg.c +5 -3
@@ -54,7 +54,8 @@ static unsigned int bsg_timeout(struct bsg_device *bd, struct sg_io_v4 *hdr) return max_t(unsigned int, timeout, BLK_MIN_SG_TIMEOUT); } -static int bsg_sg_io (struct bsg_device *bd,fmode_t mode,void __user *uarg) +static int bsg_sg_io (struct bsg_device *bd,bool open_for_write, +void __user *uarg) {struct sg_io_v4 hdr;int ret;
@@ -63,7 +64,8 @@ static int bsg_sg_io(struct bsg_device *bd, fmode_t mode, void __user *uarg)return -EFAULT ;if (hdr.guard !='Q' )return -EINVAL ; - ret = bd->sg_io_fn (bd->queue, &hdr, mode,bsg_timeout (bd, &hdr)); + ret = bd->sg_io_fn (bd->queue, &hdr, open_for_write, +bsg_timeout (bd, &hdr));if (!ret &©_to_user (uarg, &hdr,sizeof (hdr)))return -EFAULT ;return ret;
@@ -146,7 +148,7 @@ static long bsg_ioctl(struct file *file, unsigned int cmd, unsigned long arg)case SG_EMULATED_HOST :return put_user (1 , intp);case SG_IO : -return bsg_sg_io (bd, file->f_mode, uarg); +return bsg_sg_io (bd, file->f_mode &FMODE_WRITE , uarg);case SCSI_IOCTL_SEND_COMMAND :pr_warn_ratelimited ("%s: calling unsupported SCSI_IOCTL_SEND_COMMAND\n" , current->comm);
drivers/scsi/scsi_bsg.c +2 -2
@@ -10,7 +10,7 @@#define uptr64 (val) ((void __user *)(uintptr_t)(val))static int scsi_bsg_sg_io_fn (struct request_queue *q,struct sg_io_v4 *hdr, -fmode_t mode,unsigned int timeout) +bool open_for_write,unsigned int timeout) {struct scsi_cmnd *scmd;struct request *rq;
@@ -42,7 +42,7 @@ static int scsi_bsg_sg_io_fn(struct request_queue *q, struct sg_io_v4 *hdr,if (copy_from_user (scmd->cmnd,uptr64 (hdr->request), scmd->cmd_len)) goto out_put_request; ret = -EPERM ; -if (!scsi_cmd_allowed (scmd->cmnd, mode &FMODE_WRITE )) +if (!scsi_cmd_allowed (scmd->cmnd, open_for_write)) goto out_put_request; ret =0 ;
include/linux/bsg.h +1 -1
@@ -9,7 +9,7 @@ struct device;struct request_queue ;typedef int (bsg_sg_io_fn )(struct request_queue *,struct sg_io_v4 *hdr, -fmode_t mode,unsigned int timeout); +bool open_for_write,unsigned int timeout); struct bsg_device *bsg_register_queue(struct request_queue *q, struct device *parent, const char *name,
Signature · 1 line
2.39.2
Re: [PATCH 21/31] scsi: replace the fmode_t argument to ->sg_io_fn with a simple bool
Quoted 5 lines · Christoph Hellwig
Instead of passing a
fmode_tand only checking it forFMODE_WRITE, pass a boolopen_for_writeto prepare for callers that won't have thefmode_t.Signed-off-by Christoph Hellwig <[email protected]>---
Looks good to me,
Re: [PATCH 21/31] scsi: replace the fmode_t argument to ->sg_io_fn with a simple bool
In reply to Christoph HellwigQuoted 11 lines · Christoph Hellwig
Instead of passing a
fmode_tand only checking it forFMODE_WRITE, pass a boolopen_for_writeto prepare for callers that won't have thefmode_t.Signed-off-by Christoph Hellwig <[email protected]>--- block/bsg-lib.c | 2 +- block/bsg.c | 8 +++++--- drivers/scsi/scsi_bsg.c | 4 ++-- include/linux/bsg.h | 2 +- 4 files changed, 9 insertions(+), 7 deletions(-)
Cheers,
Hannes
Re: [PATCH 21/31] scsi: replace the fmode_t argument to ->sg_io_fn with a simple bool
In reply to Christoph HellwigChristoph,
Quoted 2 lines
Instead of passing a
fmode_tand only checking it forFMODE_WRITE, pass a boolopen_for_writeto prepare for callers that won't have thefmode_t.
Signature · 1 line
Martin K. Petersen Oracle Linux Engineering
Christoph Hellwig
maintainerPATCH 22/31 nvme: replace the fmode_t argument to the nvme ioctl handlers with a simple bool
In reply to Christoph HellwigInstead of passing a fmode_t and only checking it fo0r FMODE_WRITE, pass a bool open_for_write to prepare for callers that won't have the fmode_t.
--- drivers/nvme/host/ioctl.c | 62 +++++++++++++++++++++------------------ 1 file changed, 34 insertions(+), 28 deletions(-)
drivers/nvme/host/ioctl.c +34 -28
@@ -14,7 +14,7 @@ enum { };static bool nvme_cmd_allowed (struct nvme_ns *ns,struct nvme_command *c, -unsigned int flags,fmode_t mode) +unsigned int flags,bool open_for_write) {u32 effects;
@@ -80,7 +80,7 @@ static bool nvme_cmd_allowed(struct nvme_ns *ns, struct nvme_command *c,* writing. */ if (nvme_is_write (c) || (effects &NVME_CMD_EFFECTS_LBCC )) -return mode &FMODE_WRITE ; +return open_for_write;return true; }
@@ -337,7 +337,7 @@ static bool nvme_validate_passthru_nsid(struct nvme_ctrl *ctrl,static int nvme_user_cmd (struct nvme_ctrl *ctrl,struct nvme_ns *ns,struct nvme_passthru_cmd __user *ucmd,unsigned int flags, -fmode_t mode) +bool open_for_write) {struct nvme_passthru_cmd cmd;struct nvme_command c;
@@ -365,7 +365,7 @@ static int nvme_user_cmd(struct nvme_ctrl *ctrl, struct nvme_ns *ns, c.common.cdw14 =cpu_to_le32 (cmd.cdw14); c.common.cdw15 =cpu_to_le32 (cmd.cdw15); -if (!nvme_cmd_allowed (ns, &c,0 , mode)) +if (!nvme_cmd_allowed (ns, &c,0 , open_for_write))return -EACCES ;if (cmd.timeout_ms)
@@ -385,7 +385,7 @@ static int nvme_user_cmd(struct nvme_ctrl *ctrl, struct nvme_ns *ns,static int nvme_user_cmd64 (struct nvme_ctrl *ctrl,struct nvme_ns *ns,struct nvme_passthru_cmd64 __user *ucmd,unsigned int flags, -fmode_t mode) +bool open_for_write) {struct nvme_passthru_cmd64 cmd;struct nvme_command c;
@@ -412,7 +412,7 @@ static int nvme_user_cmd64(struct nvme_ctrl *ctrl, struct nvme_ns *ns, c.common.cdw14 =cpu_to_le32 (cmd.cdw14); c.common.cdw15 =cpu_to_le32 (cmd.cdw15); -if (!nvme_cmd_allowed (ns, &c, flags, mode)) +if (!nvme_cmd_allowed (ns, &c, flags, open_for_write))return -EACCES ;if (cmd.timeout_ms)
@@ -583,7 +583,7 @@ static int nvme_uring_cmd_io(struct nvme_ctrl *ctrl, struct nvme_ns *ns, c.common.cdw14 =cpu_to_le32 (READ_ONCE (cmd->cdw14)); c.common.cdw15 =cpu_to_le32 (READ_ONCE (cmd->cdw15)); -if (!nvme_cmd_allowed (ns, &c,0 , ioucmd->file->f_mode)) +if (!nvme_cmd_allowed (ns, &c,0 , ioucmd->file->f_mode &FMODE_WRITE ))return -EACCES ; d.metadata =READ_ONCE (cmd->metadata);
@@ -649,13 +649,13 @@ static bool is_ctrl_ioctl(unsigned int cmd) }static int nvme_ctrl_ioctl (struct nvme_ctrl *ctrl,unsigned int cmd, -void __user *argp,fmode_t mode) +void __user *argp,bool open_for_write) {switch (cmd) {case NVME_IOCTL_ADMIN_CMD : -return nvme_user_cmd (ctrl,NULL , argp,0 , mode); +return nvme_user_cmd (ctrl,NULL , argp,0 , open_for_write);case NVME_IOCTL_ADMIN64_CMD : -return nvme_user_cmd64 (ctrl,NULL , argp,0 , mode); +return nvme_user_cmd64 (ctrl,NULL , argp,0 , open_for_write);default :return sed_ioctl (ctrl->opal_dev, cmd, argp); }
@@ -680,14 +680,14 @@ struct nvme_user_io32 {#endif /* COMPAT_FOR_U64_ALIGNMENT */ static int nvme_ns_ioctl (struct nvme_ns *ns,unsigned int cmd, -void __user *argp,unsigned int flags,fmode_t mode) +void __user *argp,unsigned int flags,bool open_for_write) {switch (cmd) {case NVME_IOCTL_ID :force_successful_syscall_return ();return ns->head->ns_id;case NVME_IOCTL_IO_CMD : -return nvme_user_cmd (ns->ctrl, ns, argp, flags, mode); +return nvme_user_cmd (ns->ctrl, ns, argp, flags, open_for_write);/* * struct nvme_user_io can have different padding on some 32-bit ABIs. * Just accept the compat version as all fields that are used are the
@@ -702,7 +702,8 @@ static int nvme_ns_ioctl(struct nvme_ns *ns, unsigned int cmd, flags |=NVME_IOCTL_VEC ; fallthrough;case NVME_IOCTL_IO64_CMD : -return nvme_user_cmd64 (ns->ctrl, ns, argp, flags, mode); +return nvme_user_cmd64 (ns->ctrl, ns, argp, flags, + open_for_write);default :return -ENOTTY ; }
@@ -712,6 +713,7 @@ int nvme_ioctl(struct block_device *bdev, fmode_t mode, unsigned int cmd, unsigned long arg) {struct nvme_ns *ns = bdev->bd_disk->private_data; +bool open_for_write = mode &FMODE_WRITE ;void __user *argp = (void __user *)arg;unsigned int flags =0 ;
@@ -719,19 +721,20 @@ int nvme_ioctl(struct block_device *bdev, fmode_t mode, flags |=NVME_IOCTL_PARTITION ;if (is_ctrl_ioctl (cmd)) -return nvme_ctrl_ioctl (ns->ctrl, cmd, argp, mode); -return nvme_ns_ioctl (ns, cmd, argp, flags, mode); +return nvme_ctrl_ioctl (ns->ctrl, cmd, argp, open_for_write); +return nvme_ns_ioctl (ns, cmd, argp, flags, open_for_write); }long nvme_ns_chr_ioctl (struct file *file,unsigned int cmd,unsigned long arg) {struct nvme_ns *ns = container_of(file_inode(file)->i_cdev, struct nvme_ns, cdev); +bool open_for_write = file->f_mode &FMODE_WRITE ;void __user *argp = (void __user *)arg;if (is_ctrl_ioctl (cmd)) -return nvme_ctrl_ioctl (ns->ctrl, cmd, argp, file->f_mode); -return nvme_ns_ioctl (ns, cmd, argp,0 , file->f_mode); +return nvme_ctrl_ioctl (ns->ctrl, cmd, argp, open_for_write); +return nvme_ns_ioctl (ns, cmd, argp,0 , open_for_write); }static int nvme_uring_cmd_checks (unsigned int issue_flags)
@@ -800,7 +803,7 @@ int nvme_ns_chr_uring_cmd_iopoll(struct io_uring_cmd *ioucmd,#ifdef CONFIG_NVME_MULTIPATH static int nvme_ns_head_ctrl_ioctl (struct nvme_ns *ns,unsigned int cmd,void __user *argp,struct nvme_ns_head *head,int srcu_idx, -fmode_t mode) +bool open_for_write) __releases(&head->srcu) {struct nvme_ctrl *ctrl = ns->ctrl;
@@ -808,7 +811,7 @@ static int nvme_ns_head_ctrl_ioctl(struct nvme_ns *ns, unsigned int cmd,nvme_get_ctrl (ns->ctrl);srcu_read_unlock (&head->srcu, srcu_idx); - ret =nvme_ctrl_ioctl (ns->ctrl, cmd, argp, mode); + ret =nvme_ctrl_ioctl (ns->ctrl, cmd, argp, open_for_write);nvme_put_ctrl (ctrl);return ret;
@@ -818,6 +821,7 @@ int nvme_ns_head_ioctl(struct block_device *bdev, fmode_t mode, unsigned int cmd, unsigned long arg) {struct nvme_ns_head *head = bdev->bd_disk->private_data; +bool open_for_write = mode &FMODE_WRITE ;void __user *argp = (void __user *)arg;struct nvme_ns *ns;int srcu_idx, ret = -EWOULDBLOCK ;
@@ -838,9 +842,9 @@ int nvme_ns_head_ioctl(struct block_device *bdev, fmode_t mode,*/ if (is_ctrl_ioctl (cmd))return nvme_ns_head_ctrl_ioctl (ns, cmd, argp, head, srcu_idx, - mode); + open_for_write); - ret =nvme_ns_ioctl (ns, cmd, argp, flags, mode); + ret =nvme_ns_ioctl (ns, cmd, argp, flags, open_for_write); out_unlock:srcu_read_unlock (&head->srcu, srcu_idx);return ret;
@@ -849,6 +853,7 @@ int nvme_ns_head_ioctl(struct block_device *bdev, fmode_t mode,long nvme_ns_head_chr_ioctl (struct file *file,unsigned int cmd,unsigned long arg) { +bool open_for_write = file->f_mode &FMODE_WRITE ;struct cdev *cdev =file_inode (file)->i_cdev;struct nvme_ns_head *head = container_of(cdev, struct nvme_ns_head, cdev);
@@ -863,9 +868,9 @@ long nvme_ns_head_chr_ioctl(struct file *file, unsigned int cmd,if (is_ctrl_ioctl (cmd))return nvme_ns_head_ctrl_ioctl (ns, cmd, argp, head, srcu_idx, - file->f_mode); + open_for_write); - ret =nvme_ns_ioctl (ns, cmd, argp,0 , file->f_mode); + ret =nvme_ns_ioctl (ns, cmd, argp,0 , open_for_write); out_unlock:srcu_read_unlock (&head->srcu, srcu_idx);return ret;
@@ -940,7 +945,7 @@ int nvme_dev_uring_cmd(struct io_uring_cmd *ioucmd, unsigned int issue_flags) }static int nvme_dev_user_cmd (struct nvme_ctrl *ctrl,void __user *argp, -fmode_t mode) +bool open_for_write) {struct nvme_ns *ns;int ret;
@@ -964,7 +969,7 @@ static int nvme_dev_user_cmd(struct nvme_ctrl *ctrl, void __user *argp,kref_get (&ns->kref);up_read (&ctrl->namespaces_rwsem); - ret =nvme_user_cmd (ctrl, ns, argp,0 , mode); + ret =nvme_user_cmd (ctrl, ns, argp,0 , open_for_write);nvme_put_ns (ns);return ret;
@@ -976,16 +981,17 @@ static int nvme_dev_user_cmd(struct nvme_ctrl *ctrl, void __user *argp,long nvme_dev_ioctl (struct file *file,unsigned int cmd,unsigned long arg) { +bool open_for_write = file->f_mode &FMODE_WRITE ;struct nvme_ctrl *ctrl = file->private_data;void __user *argp = (void __user *)arg;switch (cmd) {case NVME_IOCTL_ADMIN_CMD : -return nvme_user_cmd (ctrl,NULL , argp,0 , file->f_mode); +return nvme_user_cmd (ctrl,NULL , argp,0 , open_for_write);case NVME_IOCTL_ADMIN64_CMD : -return nvme_user_cmd64 (ctrl,NULL , argp,0 , file->f_mode); +return nvme_user_cmd64 (ctrl,NULL , argp,0 , open_for_write);case NVME_IOCTL_IO_CMD : -return nvme_dev_user_cmd (ctrl, argp, file->f_mode); +return nvme_dev_user_cmd (ctrl, argp, open_for_write);case NVME_IOCTL_RESET :if (!capable (CAP_SYS_ADMIN ))return -EACCES ;
Signature · 1 line
2.39.2
Re: [PATCH 22/31] nvme: replace the fmode_t argument to the nvme ioctl handlers with a simple bool
Quoted 5 lines · Christoph Hellwig
Instead of passing a
fmode_tand only checking it fo0rFMODE_WRITE, pass a boolopen_for_writeto prepare for callers that won't have thefmode_t.Signed-off-by Christoph Hellwig <[email protected]>---
Looks good to me,
Re: [PATCH 22/31] nvme: replace the fmode_t argument to the nvme ioctl handlers with a simple bool
In reply to Christoph HellwigQuoted 8 lines · Christoph Hellwig
Instead of passing a
fmode_tand only checking it fo0rFMODE_WRITE, pass a boolopen_for_writeto prepare for callers that won't have thefmode_t.Signed-off-by Christoph Hellwig <[email protected]>--- drivers/nvme/host/ioctl.c | 62 +++++++++++++++++++++------------------ 1 file changed, 34 insertions(+), 28 deletions(-)
Cheers,
Hannes
Christoph Hellwig
maintainerPATCH 23/31 mtd: block: use a simple bool to track open for write
In reply to Christoph HellwigInstead of propagating the fmode_t, just use a bool to track if a mtd block device was opened for writing.
--- drivers/mtd/mtd_blkdevs.c | 2 +- drivers/mtd/mtdblock.c | 2 +- include/linux/mtd/blktrans.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
drivers/mtd/mtd_blkdevs.c +1 -1
@@ -208,7 +208,7 @@ static int blktrans_open(struct gendisk *disk, fmode_t mode) ret =__get_mtd_device (dev->mtd);if (ret) goto error_release; - dev->file_mode = mode; + dev->writable = mode &FMODE_WRITE ; unlock: dev->open++;
drivers/mtd/mtdblock.c +1 -1
@@ -294,7 +294,7 @@ static void mtdblock_release(struct mtd_blktrans_dev *mbd)* It was the last usage. Free the cache, but only sync if * opened for writing. */ -if (mbd->file_mode &FMODE_WRITE ) +if (mbd->writable)mtd_sync (mbd->mtd);vfree (mtdblk->cache_data); }
include/linux/mtd/blktrans.h +1 -1
@@ -34,7 +34,7 @@ struct mtd_blktrans_dev {struct blk_mq_tag_set *tag_set;spinlock_t queue_lock;void *priv; -fmode_t file_mode; +bool writable; };struct mtd_blktrans_ops {
Signature · 1 line
2.39.2
Re: [PATCH 23/31] mtd: block: use a simple bool to track open for write
----- Ursprüngliche Mail -----
Quoted 42 lines
Von: "hch" <[email protected]>
Instead of propagating thefmode_t, just use a bool to track if a mtd block device was opened for writing.Signed-off-by Christoph Hellwig <[email protected]>---
drivers/mtd/mtd_blkdevs.c | 2 +- drivers/mtd/mtdblock.c | 2 +- include/linux/mtd/blktrans.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)drivers/mtd/mtd_blkdevs.c +1
-1@@ -208,7 +208,7 @@ static int blktrans_open(struct gendisk *disk, fmode_t mode) ret =__get_mtd_device (dev->mtd);if (ret) goto error_release; - dev->file_mode = mode; + dev->writable = mode &FMODE_WRITE ;unlock:
dev->open++;drivers/mtd/mtdblock.c +1
-1@@ -294,7 +294,7 @@ static void mtdblock_release(struct mtd_blktrans_dev *mbd)* It was the last usage. Free the cache, but only sync if * opened for writing. */ -if (mbd->file_mode &FMODE_WRITE ) +if (mbd->writable)mtd_sync (mbd->mtd);vfree (mtdblk->cache_data); }include/linux/mtd/blktrans.h +0
-0
include/linux/mtd/blktrans.h struct mtd_blktrans_dev { · line 38
Quoted 6 lines
include/linux/mtd/blktrans.h +1
-1@@ -34,7 +34,7 @@ struct mtd_blktrans_dev {struct blk_mq_tag_set *tag_set;spinlock_t queue_lock;void *priv; -fmode_t file_mode; +bool writable; };
Thanks,
//richard
_______________________________________________
linux-um mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-um
Re: [PATCH 23/31] mtd: block: use a simple bool to track open for write
In reply to Christoph HellwigQuoted 5 lines · Christoph Hellwig
Instead of propagating the
fmode_t, just use a bool to track if a mtd block device was opened for writing.Signed-off-by Christoph Hellwig <[email protected]>---
Looks good to me,
Re: [PATCH 23/31] mtd: block: use a simple bool to track open for write
In reply to Christoph HellwigQuoted 10 lines · Christoph Hellwig
Instead of propagating the
fmode_t, just use a bool to track if a mtd block device was opened for writing.Signed-off-by Christoph Hellwig <[email protected]>--- drivers/mtd/mtd_blkdevs.c | 2 +- drivers/mtd/mtdblock.c | 2 +- include/linux/mtd/blktrans.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
Cheers,
Hannes
Christoph Hellwig
maintainerPATCH 24/31 rnbd-srv: replace sess->open_flags with a "bool readonly"
In reply to Christoph HellwigStop passing the fmode_t around and just use a simple bool to track if an export is read-only.
--- drivers/block/rnbd/rnbd-srv-sysfs.c | 3 +-- drivers/block/rnbd/rnbd-srv.c | 15 +++++++-------- drivers/block/rnbd/rnbd-srv.h | 2 +- 3 files changed, 9 insertions(+), 11 deletions(-)
drivers/block/rnbd/rnbd-srv-sysfs.c +1 -2
@@ -88,8 +88,7 @@ static ssize_t read_only_show(struct kobject *kobj, struct kobj_attribute *attr, sess_dev = container_of(kobj, struct rnbd_srv_sess_dev, kobj); -return sysfs_emit (page,"%d\n" , - !(sess_dev->open_flags &FMODE_WRITE )); +return sysfs_emit (page,"%d\n" , sess_dev->readonly); } static struct kobj_attribute rnbd_srv_dev_session_ro_attr =
drivers/block/rnbd/rnbd-srv.c +7 -8
@@ -222,7 +222,7 @@ void rnbd_destroy_sess_dev(struct rnbd_srv_sess_dev *sess_dev, bool keep_id)blkdev_put (sess_dev->bdev,NULL );mutex_lock (&sess_dev->dev->lock);list_del (&sess_dev->dev_list); -if (sess_dev->open_flags &FMODE_WRITE ) +if (!sess_dev->readonly) sess_dev->dev->open_write_cnt--;mutex_unlock (&sess_dev->dev->lock);
@@ -561,7 +561,7 @@ static void rnbd_srv_fill_msg_open_rsp(struct rnbd_msg_open_rsp *rsp,static struct rnbd_srv_sess_dev *rnbd_srv_create_set_sess_dev (struct rnbd_srv_session *srv_sess,const struct rnbd_msg_open *open_msg, -struct block_device *bdev,fmode_t open_flags, +struct block_device *bdev,bool readonly,struct rnbd_srv_dev *srv_dev) {struct rnbd_srv_sess_dev *sdev =rnbd_sess_dev_alloc (srv_sess);
@@ -576,7 +576,7 @@ rnbd_srv_create_set_sess_dev(struct rnbd_srv_session *srv_sess, sdev->bdev = bdev; sdev->sess = srv_sess; sdev->dev = srv_dev; - sdev->open_flags = open_flags; + sdev->readonly = readonly; sdev->access_mode = open_msg->access_mode;return sdev;
@@ -681,13 +681,12 @@ static int process_msg_open(struct rnbd_srv_session *srv_sess,struct rnbd_srv_sess_dev *srv_sess_dev;const struct rnbd_msg_open *open_msg = msg;struct block_device *bdev; -fmode_t open_flags; +fmode_t open_flags =FMODE_READ ;char *full_path;struct rnbd_msg_open_rsp *rsp = data;trace_process_msg_open (srv_sess, open_msg); - open_flags =FMODE_READ ;if (open_msg->access_mode !=RNBD_ACCESS_RO ) open_flags |=FMODE_WRITE ;
@@ -736,9 +735,9 @@ static int process_msg_open(struct rnbd_srv_session *srv_sess, goto blkdev_put; } - srv_sess_dev =rnbd_srv_create_set_sess_dev (srv_sess, open_msg, - bdev, open_flags, - srv_dev); + srv_sess_dev =rnbd_srv_create_set_sess_dev (srv_sess, open_msg, bdev, + open_msg->access_mode ==RNBD_ACCESS_RO , + srv_dev);if (IS_ERR (srv_sess_dev)) {pr_err ("Opening device '%s' on session %s failed, creating sess_dev failed, err: %ld\n" , full_path, srv_sess->sessname,PTR_ERR (srv_sess_dev));
drivers/block/rnbd/rnbd-srv.h +1 -1
@@ -52,7 +52,7 @@ struct rnbd_srv_sess_dev {struct kobject kobj;u32 device_id;bool keep_id; -fmode_t open_flags; +bool readonly;struct kref kref;struct completion *destroy_comp;char pathname[NAME_MAX ];
Signature · 1 line
2.39.2
Re: [PATCH 24/31] rnbd-srv: replace sess->open_flags with a "bool readonly"
Quoted 5 lines · Christoph Hellwig
Stop passing the
fmode_taround and just use a simple bool to track if an export is read-only.Signed-off-by Christoph Hellwig <[email protected]>---
Looks good to me,
Re: [PATCH 24/31] rnbd-srv: replace sess->open_flags with a "bool readonly"
In reply to Christoph HellwigQuoted 5 lines · On Tue, Jun 6, 2023 at 9:41 AM Christoph Hellwig…
Stop passing the
fmode_taround and just use a simple bool to track if an export is read-only.Signed-off-by Christoph Hellwig <[email protected]>
Quoted 95 lines
--- drivers/block/rnbd/rnbd-srv-sysfs.c | 3 +-- drivers/block/rnbd/rnbd-srv.c | 15 +++++++-------- drivers/block/rnbd/rnbd-srv.h | 2 +- 3 files changed, 9 insertions(+), 11 deletions(-)drivers/block/rnbd/rnbd-srv-sysfs.c +1
-2@@ -88,8 +88,7 @@ static ssize_t read_only_show(struct kobject *kobj, struct kobj_attribute *attr, sess_dev = container_of(kobj, struct rnbd_srv_sess_dev, kobj); -return sysfs_emit (page,"%d\n" , - !(sess_dev->open_flags &FMODE_WRITE )); +return sysfs_emit (page,"%d\n" , sess_dev->readonly); } static struct kobj_attribute rnbd_srv_dev_session_ro_attr =drivers/block/rnbd/rnbd-srv.c +7
-8@@ -222,7 +222,7 @@ void rnbd_destroy_sess_dev(struct rnbd_srv_sess_dev *sess_dev, bool keep_id)blkdev_put (sess_dev->bdev,NULL );mutex_lock (&sess_dev->dev->lock);list_del (&sess_dev->dev_list); -if (sess_dev->open_flags &FMODE_WRITE ) +if (!sess_dev->readonly) sess_dev->dev->open_write_cnt--;mutex_unlock (&sess_dev->dev->lock);@@ -561,7 +561,7 @@ static void rnbd_srv_fill_msg_open_rsp(struct rnbd_msg_open_rsp *rsp,static struct rnbd_srv_sess_dev *rnbd_srv_create_set_sess_dev (struct rnbd_srv_session *srv_sess,const struct rnbd_msg_open *open_msg, -struct block_device *bdev,fmode_t open_flags, +struct block_device *bdev,bool readonly,struct rnbd_srv_dev *srv_dev) {struct rnbd_srv_sess_dev *sdev =rnbd_sess_dev_alloc (srv_sess);@@ -576,7 +576,7 @@ rnbd_srv_create_set_sess_dev(struct rnbd_srv_session *srv_sess, sdev->bdev = bdev; sdev->sess = srv_sess; sdev->dev = srv_dev; - sdev->open_flags = open_flags; + sdev->readonly = readonly; sdev->access_mode = open_msg->access_mode;return sdev;@@ -681,13 +681,12 @@ static int process_msg_open(struct rnbd_srv_session *srv_sess,struct rnbd_srv_sess_dev *srv_sess_dev;const struct rnbd_msg_open *open_msg = msg;struct block_device *bdev; -fmode_t open_flags; +fmode_t open_flags =FMODE_READ ;char *full_path;struct rnbd_msg_open_rsp *rsp = data;trace_process_msg_open (srv_sess, open_msg); - open_flags =FMODE_READ ;if (open_msg->access_mode !=RNBD_ACCESS_RO ) open_flags |=FMODE_WRITE ;@@ -736,9 +735,9 @@ static int process_msg_open(struct rnbd_srv_session *srv_sess, goto blkdev_put; } - srv_sess_dev =rnbd_srv_create_set_sess_dev (srv_sess, open_msg, - bdev, open_flags, - srv_dev); + srv_sess_dev =rnbd_srv_create_set_sess_dev (srv_sess, open_msg, bdev, + open_msg->access_mode ==RNBD_ACCESS_RO , + srv_dev);if (IS_ERR (srv_sess_dev)) {pr_err ("Opening device '%s' on session %s failed, creating sess_dev failed, err: %ld\n" , full_path, srv_sess->sessname,PTR_ERR (srv_sess_dev));drivers/block/rnbd/rnbd-srv.h +1
-2@@ -52,7 +52,7 @@ struct rnbd_srv_sess_dev {struct kobject kobj;u32 device_id;bool keep_id; -fmode_t open_flags; +bool readonly;struct kref kref;struct completion *destroy_comp;char pathname[NAME_MAX ]; --2.39.2
Re: [PATCH 24/31] rnbd-srv: replace sess->open_flags with a "bool readonly"
In reply to Christoph HellwigQuoted 10 lines · Christoph Hellwig
Stop passing the
fmode_taround and just use a simple bool to track if an export is read-only.Signed-off-by Christoph Hellwig <[email protected]>--- drivers/block/rnbd/rnbd-srv-sysfs.c | 3 +-- drivers/block/rnbd/rnbd-srv.c | 15 +++++++-------- drivers/block/rnbd/rnbd-srv.h | 2 +- 3 files changed, 9 insertions(+), 11 deletions(-)
Cheers,
Hannes
Christoph Hellwig
maintainerPATCH 25/31 ubd: remove commented out code in ubd_open
In reply to Christoph HellwigThis code has been dead forever, make sure it doesn't show up in code searches.
--- arch/um/drivers/ubd_kern.c | 7 ------- 1 file changed, 7 deletions(-)
arch/um/drivers/ubd_kern.c +0 -7
@@ -1170,13 +1170,6 @@ static int ubd_open(struct gendisk *disk, fmode_t mode) } ubd_dev->count++;set_disk_ro (disk, !ubd_dev->openflags.w); - -/* This should no more be needed. And it didn't work anyway to exclude -* read-write remounting of filesystems.*/ -/*if((mode & FMODE_WRITE) && !ubd_dev->openflags.w){ -if(--ubd_dev->count == 0) ubd_close_dev(ubd_dev); -err = -EROFS; -}*/ out:mutex_unlock (&ubd_mutex);return err;
Signature · 1 line
2.39.2
Re: [PATCH 25/31] ubd: remove commented out code in ubd_open
----- Ursprüngliche Mail -----
Quoted 14 lines
Von: "hch" <[email protected]>
This code has been dead forever, make sure it doesn't show up in code searches.Signed-off-by Christoph Hellwig <[email protected]>---
arch/um/drivers/ubd_kern.c| 7 -------1 file changed, 7 deletions(-)arch/um/drivers/ubd_kern.c +0
-0
arch/um/drivers/ubd_kern.c static int ubd_open(struct gendisk *disk, fmode_t mode) · line 1179
Quoted 10 lines
arch/um/drivers/ubd_kern.c +0
-7@@ -1170,13 +1170,6 @@ static int ubd_open(struct gendisk *disk, fmode_t mode) } ubd_dev->count++;set_disk_ro (disk, !ubd_dev->openflags.w); - -/* This should no more be needed. And it didn't work anyway to exclude -* read-write remounting of filesystems.*/ -/*if((mode & FMODE_WRITE) && !ubd_dev->openflags.w){ -if(--ubd_dev->count == 0) ubd_close_dev(ubd_dev); -err = -EROFS; -}*/
Thanks,
//richard
Re: [PATCH 25/31] ubd: remove commented out code in ubd_open
In reply to Christoph HellwigQuoted 5 lines · Christoph Hellwig
This code has been dead forever, make sure it doesn't show up in code searches.
Signed-off-by Christoph Hellwig <[email protected]>---
Looks good to me,
Re: [PATCH 25/31] ubd: remove commented out code in ubd_open
In reply to Christoph HellwigQuoted 8 lines · Christoph Hellwig
This code has been dead forever, make sure it doesn't show up in code searches.
Signed-off-by Christoph Hellwig <[email protected]>--- arch/um/drivers/ubd_kern.c | 7 ------- 1 file changed, 7 deletions(-)
Cheers,
Hannes
Christoph Hellwig
maintainerPATCH 26/31 block: move a few internal definitions out of blkdev.h
In reply to Christoph HellwigAll these helpers are only used in core block code, so move them out of the public header.
--- block/blk.h | 23 +++++++++++++++++++++-- include/linux/blkdev.h | 27 --------------------------- 2 files changed, 21 insertions(+), 29 deletions(-)
block/blk.h +21 -2
@@ -394,10 +394,27 @@ static inline struct bio *blk_queue_bounce(struct bio *bio,#ifdef CONFIG_BLK_DEV_ZONED void disk_free_zone_bitmaps (struct gendisk *disk);void disk_clear_zone_settings (struct gendisk *disk); -#else +int blkdev_report_zones_ioctl (struct block_device *bdev,fmode_t mode, +unsigned int cmd,unsigned long arg); +int blkdev_zone_mgmt_ioctl (struct block_device *bdev,fmode_t mode, +unsigned int cmd,unsigned long arg); +#else /* CONFIG_BLK_DEV_ZONED */ static inline void disk_free_zone_bitmaps (struct gendisk *disk) {}static inline void disk_clear_zone_settings (struct gendisk *disk) {} -#endif +static inline int blkdev_report_zones_ioctl (struct block_device *bdev, +fmode_t mode,unsigned int cmd,unsigned long arg) +{ +return -ENOTTY ; +} +static inline int blkdev_zone_mgmt_ioctl (struct block_device *bdev, +fmode_t mode,unsigned int cmd,unsigned long arg) +{ +return -ENOTTY ; +} +#endif /* CONFIG_BLK_DEV_ZONED */ + +struct block_device *bdev_alloc (struct gendisk *disk,u8 partno); +void bdev_add (struct block_device *bdev,dev_t dev);int blk_alloc_ext_minor (void );void blk_free_ext_minor (unsigned int minor);
@@ -449,6 +466,8 @@ extern struct device_attribute dev_attr_events_poll_msecs;extern struct attribute_group blk_trace_attr_group; +int truncate_bdev_range (struct block_device *bdev,fmode_t mode,loff_t lstart, +loff_t lend);long blkdev_ioctl (struct file *file,unsigned cmd,unsigned long arg);long compat_blkdev_ioctl (struct file *file,unsigned cmd,unsigned long arg);
include/linux/blkdev.h +0 -27
@@ -318,7 +318,6 @@ typedef int (*report_zones_cb)(struct blk_zone *zone, unsigned int idx,void disk_set_zoned (struct gendisk *disk,enum blk_zoned_model model);#ifdef CONFIG_BLK_DEV_ZONED -#define BLK_ALL_ZONES ((unsigned int)-1)int blkdev_report_zones (struct block_device *bdev,sector_t sector,unsigned int nr_zones,report_zones_cb cb,void *data);
@@ -328,33 +327,11 @@ extern int blkdev_zone_mgmt(struct block_device *bdev, enum req_op op, gfp_t gfp_mask);int blk_revalidate_disk_zones (struct gendisk *disk,void (*update_driver_data)(struct gendisk *disk)); - -extern int blkdev_report_zones_ioctl (struct block_device *bdev,fmode_t mode, -unsigned int cmd,unsigned long arg); -extern int blkdev_zone_mgmt_ioctl (struct block_device *bdev,fmode_t mode, -unsigned int cmd,unsigned long arg); -#else /* CONFIG_BLK_DEV_ZONED */ -static inline unsigned int bdev_nr_zones (struct block_device *bdev) {return 0 ; } - -static inline int blkdev_report_zones_ioctl (struct block_device *bdev, -fmode_t mode,unsigned int cmd, -unsigned long arg) -{ -return -ENOTTY ; -} - -static inline int blkdev_zone_mgmt_ioctl (struct block_device *bdev, -fmode_t mode,unsigned int cmd, -unsigned long arg) -{ -return -ENOTTY ; -} -#endif /* CONFIG_BLK_DEV_ZONED */ /*
@@ -1493,11 +1470,7 @@ void blkdev_put(struct block_device *bdev, void *holder);struct block_device *blkdev_get_no_open (dev_t dev);void blkdev_put_no_open (struct block_device *bdev); -struct block_device *bdev_alloc (struct gendisk *disk,u8 partno); -void bdev_add (struct block_device *bdev,dev_t dev);struct block_device *I_BDEV (struct inode *inode); -int truncate_bdev_range (struct block_device *bdev,fmode_t mode,loff_t lstart, -loff_t lend);#ifdef CONFIG_BLOCK void invalidate_bdev (struct block_device *bdev);
Signature · 1 line
2.39.2
Re: [PATCH 26/31] block: move a few internal definitions out of blkdev.h
Quoted 5 lines · Christoph Hellwig
All these helpers are only used in core block code, so move them out of the public header.
Signed-off-by Christoph Hellwig <[email protected]>---
Looks good to me,
Re: [PATCH 26/31] block: move a few internal definitions out of blkdev.h
In reply to Christoph HellwigQuoted 9 lines · Christoph Hellwig
All these helpers are only used in core block code, so move them out of the public header.
Signed-off-by Christoph Hellwig <[email protected]>--- block/blk.h | 23 +++++++++++++++++++++-- include/linux/blkdev.h | 27 --------------------------- 2 files changed, 21 insertions(+), 29 deletions(-)
Cheers,
Hannes
Christoph Hellwig
maintainerPATCH 27/31 block: remove unused fmode_t arguments from ioctl handlers
In reply to Christoph HellwigA few ioctl handlers have fmode_t arguments that are entirely unused, remove them.
--- block/blk-zoned.c | 4 ++-- block/blk.h | 6 +++--- block/ioctl.c | 14 +++++++------- 3 files changed, 12 insertions(+), 12 deletions(-)
block/blk-zoned.c +2 -2
@@ -323,8 +323,8 @@ static int blkdev_copy_zone_to_user(struct blk_zone *zone, unsigned int idx,* BLKREPORTZONE ioctl processing. * Called from blkdev_ioctl. */ -int blkdev_report_zones_ioctl (struct block_device *bdev,fmode_t mode, -unsigned int cmd,unsigned long arg) +int blkdev_report_zones_ioctl (struct block_device *bdev,unsigned int cmd, +unsigned long arg) {void __user *argp = (void __user *)arg;struct zone_report_args args;
block/blk.h +3 -3
@@ -394,15 +394,15 @@ static inline struct bio *blk_queue_bounce(struct bio *bio,#ifdef CONFIG_BLK_DEV_ZONED void disk_free_zone_bitmaps (struct gendisk *disk);void disk_clear_zone_settings (struct gendisk *disk); -int blkdev_report_zones_ioctl (struct block_device *bdev,fmode_t mode, -unsigned int cmd,unsigned long arg); +int blkdev_report_zones_ioctl (struct block_device *bdev,unsigned int cmd, +unsigned long arg);int blkdev_zone_mgmt_ioctl (struct block_device *bdev,fmode_t mode,unsigned int cmd,unsigned long arg);#else /* CONFIG_BLK_DEV_ZONED */ static inline void disk_free_zone_bitmaps (struct gendisk *disk) {}static inline void disk_clear_zone_settings (struct gendisk *disk) {}static inline int blkdev_report_zones_ioctl (struct block_device *bdev, -fmode_t mode,unsigned int cmd,unsigned long arg) +unsigned int cmd,unsigned long arg) {return -ENOTTY ; }
block/ioctl.c +7 -7
@@ -344,8 +344,8 @@ static int blkdev_pr_clear(struct block_device *bdev,return ops->pr_clear (bdev, c.key); } -static int blkdev_flushbuf (struct block_device *bdev,fmode_t mode, -unsigned cmd,unsigned long arg) +static int blkdev_flushbuf (struct block_device *bdev,unsigned cmd, +unsigned long arg) {if (!capable (CAP_SYS_ADMIN ))return -EACCES ;
@@ -354,8 +354,8 @@ static int blkdev_flushbuf(struct block_device *bdev, fmode_t mode,return 0 ; } -static int blkdev_roset (struct block_device *bdev,fmode_t mode, -unsigned cmd,unsigned long arg) +static int blkdev_roset (struct block_device *bdev,unsigned cmd, +unsigned long arg) {int ret, n;
@@ -475,9 +475,9 @@ static int blkdev_common_ioctl(struct block_device *bdev, fmode_t mode,switch (cmd) {case BLKFLSBUF : -return blkdev_flushbuf (bdev, mode, cmd, arg); +return blkdev_flushbuf (bdev, cmd, arg);case BLKROSET : -return blkdev_roset (bdev, mode, cmd, arg); +return blkdev_roset (bdev, cmd, arg);case BLKDISCARD :return blk_ioctl_discard (bdev, mode, arg);case BLKSECDISCARD :
@@ -487,7 +487,7 @@ static int blkdev_common_ioctl(struct block_device *bdev, fmode_t mode,case BLKGETDISKSEQ :return put_u64 (argp, bdev->bd_disk->diskseq);case BLKREPORTZONE : -return blkdev_report_zones_ioctl (bdev, mode, cmd, arg); +return blkdev_report_zones_ioctl (bdev, cmd, arg);case BLKRESETZONE :case BLKOPENZONE :case BLKCLOSEZONE :
Signature · 1 line
2.39.2
Re: [PATCH 27/31] block: remove unused fmode_t arguments from ioctl handlers
Quoted 5 lines · Christoph Hellwig
A few ioctl handlers have
fmode_targuments that are entirely unused, remove them.Signed-off-by Christoph Hellwig <[email protected]>---
Looks good to me,
Re: [PATCH 27/31] block: remove unused fmode_t arguments from ioctl handlers
In reply to Christoph HellwigQuoted 10 lines · Christoph Hellwig
A few ioctl handlers have
fmode_targuments that are entirely unused, remove them.Signed-off-by Christoph Hellwig <[email protected]>--- block/blk-zoned.c | 4 ++-- block/blk.h | 6 +++--- block/ioctl.c | 14 +++++++------- 3 files changed, 12 insertions(+), 12 deletions(-)
Cheers,
Hannes
Christoph Hellwig
maintainerPATCH 28/31 block: replace fmode_t with a block-specific type for block open flags
In reply to Christoph HellwigThe only overlap between the block open flags mapped into the fmode_t and other uses of fmode_t are FMODE_READ and FMODE_WRITE. Define a new blk_mode_t instead for use in blkdev_get_by_*, ->open and ->ioctl and stop abusing fmode_t.
--- arch/um/drivers/ubd_kern.c | 8 +++--- arch/xtensa/platforms/iss/simdisk.c | 2 +- block/bdev.c | 32 +++++++++++----------- block/blk-zoned.c | 8 +++--- block/blk.h | 11 ++++---- block/fops.c | 26 +++++++++++++----- block/genhd.c | 8 +++--- block/ioctl.c | 42 +++++++++-------------------- drivers/block/amiflop.c | 12 ++++----- drivers/block/aoe/aoeblk.c | 4 +-- drivers/block/ataflop.c | 25 +++++++++-------- drivers/block/drbd/drbd_main.c | 7 ++--- drivers/block/drbd/drbd_nl.c | 2 +- drivers/block/floppy.c | 28 +++++++++---------- drivers/block/loop.c | 22 +++++++-------- drivers/block/mtip32xx/mtip32xx.c | 4 +-- drivers/block/nbd.c | 4 +-- drivers/block/pktcdvd.c | 17 ++++++------ drivers/block/rbd.c | 2 +- drivers/block/rnbd/rnbd-clt.c | 4 +-- drivers/block/rnbd/rnbd-srv.c | 4 +-- drivers/block/sunvdc.c | 2 +- drivers/block/swim.c | 16 +++++------ drivers/block/swim3.c | 24 ++++++++--------- drivers/block/ublk_drv.c | 2 +- drivers/block/xen-blkback/xenbus.c | 2 +- drivers/block/xen-blkfront.c | 2 +- drivers/block/z2ram.c | 2 +- drivers/block/zram/zram_drv.c | 6 ++--- drivers/cdrom/cdrom.c | 4 +-- drivers/cdrom/gdrom.c | 4 +-- drivers/md/bcache/bcache.h | 2 +- drivers/md/bcache/request.c | 4 +-- drivers/md/bcache/super.c | 6 ++--- drivers/md/dm-cache-target.c | 12 ++++----- drivers/md/dm-clone-target.c | 10 +++---- drivers/md/dm-core.h | 7 +++-- drivers/md/dm-era-target.c | 6 +++-- drivers/md/dm-ioctl.c | 10 +++---- drivers/md/dm-snap.c | 4 +-- drivers/md/dm-table.c | 11 ++++---- drivers/md/dm-thin.c | 9 ++++--- drivers/md/dm-verity-fec.c | 2 +- drivers/md/dm-verity-target.c | 6 ++--- drivers/md/dm.c | 10 +++---- drivers/md/dm.h | 2 +- drivers/md/md.c | 8 +++--- drivers/mmc/core/block.c | 8 +++--- drivers/mtd/devices/block2mtd.c | 4 +-- drivers/mtd/mtd_blkdevs.c | 4 +-- drivers/mtd/ubi/block.c | 5 ++-- drivers/nvme/host/core.c | 2 +- drivers/nvme/host/ioctl.c | 8 +++--- drivers/nvme/host/multipath.c | 2 +- drivers/nvme/host/nvme.h | 4 +-- drivers/nvme/target/io-cmd-bdev.c | 2 +- drivers/s390/block/dasd.c | 6 ++--- drivers/s390/block/dasd_genhd.c | 3 ++- drivers/s390/block/dasd_int.h | 3 ++- drivers/s390/block/dasd_ioctl.c | 2 +- drivers/s390/block/dcssblk.c | 4 +-- drivers/scsi/sd.c | 19 ++++++------- drivers/scsi/sr.c | 10 +++---- drivers/target/target_core_iblock.c | 5 ++-- drivers/target/target_core_pscsi.c | 4 +-- fs/btrfs/dev-replace.c | 2 +- fs/btrfs/super.c | 4 +-- fs/btrfs/volumes.c | 16 +++++------ fs/btrfs/volumes.h | 4 +-- fs/erofs/super.c | 2 +- fs/ext4/super.c | 2 +- fs/jfs/jfs_logmgr.c | 2 +- fs/nfs/blocklayout/dev.c | 5 ++-- fs/ocfs2/cluster/heartbeat.c | 3 ++- fs/reiserfs/journal.c | 4 +-- fs/xfs/xfs_super.c | 2 +- include/linux/blkdev.h | 30 ++++++++++++++++----- include/linux/cdrom.h | 3 ++- include/linux/device-mapper.h | 8 +++--- kernel/power/swap.c | 6 ++--- mm/swapfile.c | 2 +- 81 files changed, 324 insertions(+), 311 deletions(-)
arch/um/drivers/ubd_kern.c +4 -4
@@ -108,9 +108,9 @@ static inline void ubd_set_bit(__u64 bit, unsigned char *data)static DEFINE_MUTEX (ubd_lock);static DEFINE_MUTEX (ubd_mutex);/* replaces BKL, might not be needed */ -static int ubd_open (struct gendisk *disk,fmode_t mode); +static int ubd_open (struct gendisk *disk,blk_mode_t mode);static void ubd_release (struct gendisk *disk); -static int ubd_ioctl (struct block_device *bdev,fmode_t mode, +static int ubd_ioctl (struct block_device *bdev,blk_mode_t mode,unsigned int cmd,unsigned long arg);static int ubd_getgeo (struct block_device *bdev,struct hd_geometry *geo);
@@ -1154,7 +1154,7 @@ static int __init ubd_driver_init(void){device_initcall (ubd_driver_init); -static int ubd_open (struct gendisk *disk,fmode_t mode) +static int ubd_open (struct gendisk *disk,blk_mode_t mode) {struct ubd *ubd_dev = disk->private_data;int err =0 ;
@@ -1389,7 +1389,7 @@ static int ubd_getgeo(struct block_device *bdev, struct hd_geometry *geo)return 0 ; } -static int ubd_ioctl (struct block_device *bdev,fmode_t mode, +static int ubd_ioctl (struct block_device *bdev,blk_mode_t mode,unsigned int cmd,unsigned long arg) {struct ubd *ubd_dev = bdev->bd_disk->private_data;
arch/xtensa/platforms/iss/simdisk.c +1 -1
@@ -120,7 +120,7 @@ static void simdisk_submit_bio(struct bio *bio)bio_endio (bio); } -static int simdisk_open (struct gendisk *disk,fmode_t mode) +static int simdisk_open (struct gendisk *disk,blk_mode_t mode) {struct simdisk *dev = disk->private_data;
block/bdev.c +16 -16
@@ -93,7 +93,7 @@ EXPORT_SYMBOL(invalidate_bdev);* Drop all buffers & page cache for given bdev range. This function bails * with error if bdev has other exclusive owner (such as filesystem). */ -int truncate_bdev_range (struct block_device *bdev,fmode_t mode, +int truncate_bdev_range (struct block_device *bdev,blk_mode_t mode,loff_t lstart,loff_t lend) {/*
@@ -101,14 +101,14 @@ int truncate_bdev_range(struct block_device *bdev, fmode_t mode,* while we discard the buffer cache to avoid discarding buffers * under live filesystem. */ -if (!(mode &FMODE_EXCL )) { +if (!(mode &BLK_OPEN_EXCL )) {int err =bd_prepare_to_claim (bdev, truncate_bdev_range,NULL );if (err) goto invalidate; }truncate_inode_pages_range (bdev->bd_inode->i_mapping, lstart, lend); -if (!(mode &FMODE_EXCL )) +if (!(mode &BLK_OPEN_EXCL ))bd_abort_claiming (bdev, truncate_bdev_range);return 0 ;
@@ -647,7 +647,7 @@ static void blkdev_flush_mapping(struct block_device *bdev)bdev_write_inode (bdev); } -static int blkdev_get_whole (struct block_device *bdev,fmode_t mode) +static int blkdev_get_whole (struct block_device *bdev,blk_mode_t mode) {struct gendisk *disk = bdev->bd_disk;int ret;
@@ -679,7 +679,7 @@ static void blkdev_put_whole(struct block_device *bdev) bdev->bd_disk->fops->release (bdev->bd_disk); } -static int blkdev_get_part (struct block_device *part,fmode_t mode) +static int blkdev_get_part (struct block_device *part,blk_mode_t mode) {struct gendisk *disk = part->bd_disk;int ret;
@@ -743,11 +743,11 @@ void blkdev_put_no_open(struct block_device *bdev) {put_device (&bdev->bd_device); } - +/** * blkdev_get_by_dev - open a block device by device number * @dev: device number of block device to open -* @mode: FMODE_* mask +* @mode: open mode (BLK_OPEN_*) * @holder: exclusive holder identifier * @hops: holder operations *
@@ -765,7 +765,7 @@ void blkdev_put_no_open(struct block_device *bdev)* RETURNS: * Reference to the block_device on success, ERR_PTR(-errno) on failure. */ -struct block_device *blkdev_get_by_dev (dev_t dev,fmode_t mode,void *holder, +struct block_device *blkdev_get_by_dev (dev_t dev,blk_mode_t mode,void *holder,const struct blk_holder_ops *hops) {bool unblock_events = true;
@@ -775,8 +775,8 @@ struct block_device *blkdev_get_by_dev(dev_t dev, fmode_t mode, void *holder, ret =devcgroup_check_permission (DEVCG_DEV_BLOCK ,MAJOR (dev),MINOR (dev), - ((mode &FMODE_READ ) ?DEVCG_ACC_READ :0 ) | - ((mode &FMODE_WRITE ) ?DEVCG_ACC_WRITE :0 )); + ((mode &BLK_OPEN_READ ) ?DEVCG_ACC_READ :0 ) | + ((mode &BLK_OPEN_WRITE ) ?DEVCG_ACC_WRITE :0 ));if (ret)return ERR_PTR (ret);
@@ -786,12 +786,12 @@ struct block_device *blkdev_get_by_dev(dev_t dev, fmode_t mode, void *holder, disk = bdev->bd_disk;if (holder) { - mode |=FMODE_EXCL ; + mode |=BLK_OPEN_EXCL ; ret =bd_prepare_to_claim (bdev, holder, hops);if (ret) goto put_blkdev; }else { -if (WARN_ON_ONCE (mode &FMODE_EXCL )) { +if (WARN_ON_ONCE (mode &BLK_OPEN_EXCL )) { ret = -EIO ; goto put_blkdev; }
@@ -821,7 +821,7 @@ struct block_device *blkdev_get_by_dev(dev_t dev, fmode_t mode, void *holder,* writeable reference is too fragile given the way @mode is * used in blkdev_get/put(). */ -if ((mode &FMODE_WRITE ) && !bdev->bd_write_holder && +if ((mode &BLK_OPEN_WRITE ) && !bdev->bd_write_holder && (disk->event_flags &DISK_EVENT_FLAG_BLOCK_ON_EXCL_WRITE )) { bdev->bd_write_holder = true; unblock_events = false;
@@ -848,7 +848,7 @@ EXPORT_SYMBOL(blkdev_get_by_dev);/** * blkdev_get_by_path - open a block device by name * @path: path to the block device to open -* @mode: FMODE_* mask +* @mode: open mode (BLK_OPEN_*) * @holder: exclusive holder identifier * * Open the block device described by the device file at @path. If @holder is
@@ -861,7 +861,7 @@ EXPORT_SYMBOL(blkdev_get_by_dev);* RETURNS: * Reference to the block_device on success, ERR_PTR(-errno) on failure. */ -struct block_device *blkdev_get_by_path (const char *path,fmode_t mode, +struct block_device *blkdev_get_by_path (const char *path,blk_mode_t mode,void *holder,const struct blk_holder_ops *hops) {struct block_device *bdev;
@@ -873,7 +873,7 @@ struct block_device *blkdev_get_by_path(const char *path, fmode_t mode,return ERR_PTR (error); bdev =blkdev_get_by_dev (dev, mode, holder, hops); -if (!IS_ERR (bdev) && (mode &FMODE_WRITE ) &&bdev_read_only (bdev)) { +if (!IS_ERR (bdev) && (mode &BLK_OPEN_WRITE ) &&bdev_read_only (bdev)) {blkdev_put (bdev, holder);return ERR_PTR (-EACCES ); }
block/blk-zoned.c +4 -4
@@ -356,8 +356,8 @@ int blkdev_report_zones_ioctl(struct block_device *bdev, unsigned int cmd,return 0 ; } -static int blkdev_truncate_zone_range (struct block_device *bdev,fmode_t mode, -const struct blk_zone_range *zrange) +static int blkdev_truncate_zone_range (struct block_device *bdev, +blk_mode_t mode,const struct blk_zone_range *zrange) {loff_t start, end;
@@ -376,7 +376,7 @@ static int blkdev_truncate_zone_range(struct block_device *bdev, fmode_t mode,* BLKRESETZONE, BLKOPENZONE, BLKCLOSEZONE and BLKFINISHZONE ioctl processing. * Called from blkdev_ioctl. */ -int blkdev_zone_mgmt_ioctl (struct block_device *bdev,fmode_t mode, +int blkdev_zone_mgmt_ioctl (struct block_device *bdev,blk_mode_t mode,unsigned int cmd,unsigned long arg) {void __user *argp = (void __user *)arg;
@@ -390,7 +390,7 @@ int blkdev_zone_mgmt_ioctl(struct block_device *bdev, fmode_t mode,if (!bdev_is_zoned (bdev))return -ENOTTY ; -if (!(mode &FMODE_WRITE )) +if (!(mode &BLK_OPEN_WRITE ))return -EBADF ;if (copy_from_user (&zrange, argp,sizeof (struct blk_zone_range )))
block/blk.h +6 -5
@@ -396,7 +396,7 @@ void disk_free_zone_bitmaps(struct gendisk *disk);void disk_clear_zone_settings (struct gendisk *disk);int blkdev_report_zones_ioctl (struct block_device *bdev,unsigned int cmd,unsigned long arg); -int blkdev_zone_mgmt_ioctl (struct block_device *bdev,fmode_t mode, +int blkdev_zone_mgmt_ioctl (struct block_device *bdev,blk_mode_t mode,unsigned int cmd,unsigned long arg);#else /* CONFIG_BLK_DEV_ZONED */ static inline void disk_free_zone_bitmaps (struct gendisk *disk) {}
@@ -407,7 +407,7 @@ static inline int blkdev_report_zones_ioctl(struct block_device *bdev,return -ENOTTY ; }static inline int blkdev_zone_mgmt_ioctl (struct block_device *bdev, -fmode_t mode,unsigned int cmd,unsigned long arg) +blk_mode_t mode,unsigned int cmd,unsigned long arg) {return -ENOTTY ; }
@@ -451,7 +451,7 @@ static inline void bio_release_page(struct bio *bio, struct page *page)struct request_queue *blk_alloc_queue (int node_id); -int disk_scan_partitions (struct gendisk *disk,fmode_t mode); +int disk_scan_partitions (struct gendisk *disk,blk_mode_t mode);int disk_alloc_events (struct gendisk *disk);void disk_add_events (struct gendisk *disk);
@@ -466,8 +466,9 @@ extern struct device_attribute dev_attr_events_poll_msecs;extern struct attribute_group blk_trace_attr_group; -int truncate_bdev_range (struct block_device *bdev,fmode_t mode,loff_t lstart, -loff_t lend); +blk_mode_t file_to_blk_mode (struct file *file); +int truncate_bdev_range (struct block_device *bdev,blk_mode_t mode, +loff_t lstart,loff_t lend);long blkdev_ioctl (struct file *file,unsigned cmd,unsigned long arg);long compat_blkdev_ioctl (struct file *file,unsigned cmd,unsigned long arg);
block/fops.c +20 -6
@@ -470,6 +470,24 @@ static int blkdev_fsync(struct file *filp, loff_t start, loff_t end,return error; } +blk_mode_t file_to_blk_mode (struct file *file) +{ +blk_mode_t mode =0 ; + +if (file->f_mode &FMODE_READ ) + mode |=BLK_OPEN_READ ; +if (file->f_mode &FMODE_WRITE ) + mode |=BLK_OPEN_WRITE ; +if (file->f_mode &FMODE_EXCL ) + mode |=BLK_OPEN_EXCL ; +if ((file->f_flags &O_ACCMODE ) ==3 ) + mode |=BLK_OPEN_WRITE_IOCTL ; +if (file->f_flags &O_NDELAY ) + mode |=BLK_OPEN_NDELAY ; + +return mode; +} +static int blkdev_open (struct inode *inode,struct file *filp) {struct block_device *bdev;
@@ -483,14 +501,10 @@ static int blkdev_open(struct inode *inode, struct file *filp) filp->f_flags |=O_LARGEFILE ; filp->f_mode |=FMODE_NOWAIT |FMODE_BUF_RASYNC ; -if (filp->f_flags &O_NDELAY ) - filp->f_mode |=FMODE_NDELAY ;if (filp->f_flags &O_EXCL ) filp->f_mode |=FMODE_EXCL ; -if ((filp->f_flags &O_ACCMODE ) ==3 ) - filp->f_mode |=FMODE_WRITE_IOCTL ; - bdev =blkdev_get_by_dev (inode->i_rdev, filp->f_mode, + bdev =blkdev_get_by_dev (inode->i_rdev,file_to_blk_mode (filp), (filp->f_mode &FMODE_EXCL ) ? filp :NULL ,NULL );if (IS_ERR (bdev))
@@ -648,7 +662,7 @@ static long blkdev_fallocate(struct file *file, int mode, loff_t start,filemap_invalidate_lock (inode->i_mapping);/* Invalidate the page cache, including dirty pages. */ - error =truncate_bdev_range (bdev, file->f_mode, start, end); + error =truncate_bdev_range (bdev,file_to_blk_mode (file), start, end);if (error) goto fail;
block/genhd.c +4 -4
@@ -339,7 +339,7 @@ void disk_uevent(struct gendisk *disk, enum kobject_action action) }EXPORT_SYMBOL_GPL (disk_uevent); -int disk_scan_partitions (struct gendisk *disk,fmode_t mode) +int disk_scan_partitions (struct gendisk *disk,blk_mode_t mode) {struct block_device *bdev;int ret =0 ;
@@ -357,7 +357,7 @@ int disk_scan_partitions(struct gendisk *disk, fmode_t mode)* synchronize with other exclusive openers and other partition * scanners. */ -if (!(mode &FMODE_EXCL )) { +if (!(mode &BLK_OPEN_EXCL )) { ret =bd_prepare_to_claim (disk->part0, disk_scan_partitions,NULL );if (ret)
@@ -377,7 +377,7 @@ int disk_scan_partitions(struct gendisk *disk, fmode_t mode)* creat partition for underlying disk. */ clear_bit (GD_NEED_PART_SCAN , &disk->state); -if (!(mode &FMODE_EXCL )) +if (!(mode &BLK_OPEN_EXCL ))bd_abort_claiming (disk->part0, disk_scan_partitions);return ret; }
@@ -505,7 +505,7 @@ int __must_check device_add_disk(struct device *parent, struct gendisk *disk,bdev_add (disk->part0, ddev->devt);if (get_capacity (disk)) -disk_scan_partitions (disk,FMODE_READ ); +disk_scan_partitions (disk,BLK_OPEN_READ );/* * Announce the disk and partitions after all partitions are
block/ioctl.c +12 -30
116 lines not on this page · raw message
drivers/block/amiflop.c +5 -7
@@ -1532,7 +1532,7 @@ static int fd_getgeo(struct block_device *bdev, struct hd_geometry *geo)return 0 ; } -static int fd_locked_ioctl (struct block_device *bdev,fmode_t mode, +static int fd_locked_ioctl (struct block_device *bdev,blk_mode_t mode,unsigned int cmd,unsigned long param) {struct amiga_floppy_struct *p = bdev->bd_disk->private_data;
@@ -1607,7 +1607,7 @@ static int fd_locked_ioctl(struct block_device *bdev, fmode_t mode,return 0 ; } -static int fd_ioctl (struct block_device *bdev,fmode_t mode, +static int fd_ioctl (struct block_device *bdev,blk_mode_t mode,unsigned int cmd,unsigned long param) {int ret;
@@ -1654,7 +1654,7 @@ static void fd_probe(int dev)* /dev/PS0 etc), and disallows simultaneous access to the same * drive with different device numbers. */ -static int floppy_open (struct gendisk *disk,fmode_t mode) +static int floppy_open (struct gendisk *disk,blk_mode_t mode) {int drive = disk->first_minor &3 ;int system = (disk->first_minor &4 ) >>2 ;
@@ -1673,10 +1673,9 @@ static int floppy_open(struct gendisk *disk, fmode_t mode)mutex_unlock (&amiflop_mutex);return -ENXIO ; } - -if (mode & (FMODE_READ |FMODE_WRITE )) { +if (mode & (BLK_OPEN_READ |BLK_OPEN_WRITE )) {disk_check_media_change (disk); -if (mode &FMODE_WRITE ) { +if (mode &BLK_OPEN_WRITE ) {int wrprot;get_fdc (drive);
@@ -1691,7 +1690,6 @@ static int floppy_open(struct gendisk *disk, fmode_t mode) } } } -local_irq_save (flags); fd_ref[drive]++; fd_device[drive] = system;
drivers/block/aoe/aoeblk.c +2 -2
@@ -204,7 +204,7 @@ aoedisk_rm_debugfs(struct aoedev *d) }static int -aoeblk_open (struct gendisk *disk,fmode_t mode) +aoeblk_open (struct gendisk *disk,blk_mode_t mode) {struct aoedev *d = disk->private_data;ulong flags;
@@ -285,7 +285,7 @@ aoeblk_getgeo(struct block_device *bdev, struct hd_geometry *geo) }static int -aoeblk_ioctl (struct block_device *bdev,fmode_t mode,uint cmd,ulong arg) +aoeblk_ioctl (struct block_device *bdev,blk_mode_t mode,uint cmd,ulong arg) {struct aoedev *d;
drivers/block/ataflop.c +12 -13
@@ -442,12 +442,12 @@ static void fd_times_out(struct timer_list *unused);static void finish_fdc (void );static void finish_fdc_done (int dummy );static void setup_req_params (int drive ); -static int fd_locked_ioctl (struct block_device *bdev,fmode_t mode,unsigned int - cmd,unsigned long param); +static int fd_locked_ioctl (struct block_device *bdev,blk_mode_t mode, +unsigned int cmd,unsigned long param);static void fd_probe (int drive );static int fd_test_drive_present (int drive );static void config_types (void ); -static int floppy_open (struct gendisk *disk,fmode_t mode); +static int floppy_open (struct gendisk *disk,blk_mode_t mode);static void floppy_release (struct gendisk *disk);/************************* End of Prototypes **************************/
@@ -1581,7 +1581,7 @@ static blk_status_t ataflop_queue_rq(struct blk_mq_hw_ctx *hctx,return BLK_STS_OK ; } -static int fd_locked_ioctl (struct block_device *bdev,fmode_t mode, +static int fd_locked_ioctl (struct block_device *bdev,blk_mode_t mode,unsigned int cmd,unsigned long param) {struct gendisk *disk = bdev->bd_disk;
@@ -1768,7 +1768,7 @@ static int fd_locked_ioctl(struct block_device *bdev, fmode_t mode, } } -static int fd_ioctl (struct block_device *bdev,fmode_t mode, +static int fd_ioctl (struct block_device *bdev,blk_mode_t mode,unsigned int cmd,unsigned long arg) {int ret;
@@ -1915,7 +1915,7 @@ static void __init config_types( void )* drive with different device numbers. */ -static int floppy_open (struct gendisk *disk,fmode_t mode) +static int floppy_open (struct gendisk *disk,blk_mode_t mode) {struct atari_floppy_struct *p = disk->private_data;int type = disk->first_minor >>2 ;
@@ -1924,23 +1924,22 @@ static int floppy_open(struct gendisk *disk, fmode_t mode)if (p->ref && p->type != type)return -EBUSY ; -if (p->ref ==-1 || (p->ref && mode &FMODE_EXCL )) +if (p->ref ==-1 || (p->ref && mode &BLK_OPEN_EXCL ))return -EBUSY ; - -if (mode &FMODE_EXCL ) +if (mode &BLK_OPEN_EXCL ) p->ref =-1 ;else p->ref++; p->type = type; -if (mode &FMODE_NDELAY ) +if (mode &BLK_OPEN_NDELAY )return 0 ; -if (mode & (FMODE_READ |FMODE_WRITE )) { +if (mode & (BLK_OPEN_READ |BLK_OPEN_WRITE )) {if (disk_check_media_change (disk))floppy_revalidate (disk); -if (mode &FMODE_WRITE ) { +if (mode &BLK_OPEN_WRITE ) {if (p->wpstat) {if (p->ref <0 ) p->ref =0 ;
@@ -1953,7 +1952,7 @@ static int floppy_open(struct gendisk *disk, fmode_t mode)return 0 ; } -static int floppy_unlocked_open (struct gendisk *disk,fmode_t mode) +static int floppy_unlocked_open (struct gendisk *disk,blk_mode_t mode) {int ret;
drivers/block/drbd/drbd_main.c +4 -3
@@ -49,7 +49,7 @@#include "drbd_debugfs.h" static DEFINE_MUTEX (drbd_main_mutex); -static int drbd_open (struct gendisk *disk,fmode_t mode); +static int drbd_open (struct gendisk *disk,blk_mode_t mode);static void drbd_release (struct gendisk *gd);static void md_sync_timer_fn (struct timer_list *t);static int w_bitmap_io (struct drbd_work *w,int unused);
@@ -1882,7 +1882,7 @@ int drbd_send_all(struct drbd_connection *connection, struct socket *sock, voidreturn 0 ; } -static int drbd_open (struct gendisk *disk,fmode_t mode) +static int drbd_open (struct gendisk *disk,blk_mode_t mode) {struct drbd_device *device = disk->private_data;unsigned long flags;
@@ -1894,7 +1894,7 @@ static int drbd_open(struct gendisk *disk, fmode_t mode)* and no race with updating open_cnt */ if (device->state.role !=R_PRIMARY ) { -if (mode &FMODE_WRITE ) +if (mode &BLK_OPEN_WRITE ) rv = -EROFS ;else if (!drbd_allow_oos) rv = -EMEDIUMTYPE ;
@@ -1911,6 +1911,7 @@ static int drbd_open(struct gendisk *disk, fmode_t mode)static void drbd_release (struct gendisk *gd) {struct drbd_device *device = gd->private_data; +mutex_lock (&drbd_main_mutex); device->open_cnt--;mutex_unlock (&drbd_main_mutex);
drivers/block/drbd/drbd_nl.c +1 -1
@@ -1640,7 +1640,7 @@ static struct block_device *open_backing_dev(struct drbd_device *device,struct block_device *bdev;int err =0 ; - bdev =blkdev_get_by_path (bdev_path,FMODE_READ |FMODE_WRITE , + bdev =blkdev_get_by_path (bdev_path,BLK_OPEN_READ |BLK_OPEN_WRITE , claim_ptr,NULL );if (IS_ERR (bdev)) { drbd_err(device, "open(\"%s\") failed with %ld\n",
drivers/block/floppy.c +14 -14
@@ -3394,8 +3394,8 @@ static bool valid_floppy_drive_params(const short autodetect[FD_AUTODETECT_SIZE]return true; } -static int fd_locked_ioctl (struct block_device *bdev,fmode_t mode,unsigned int cmd, -unsigned long param) +static int fd_locked_ioctl (struct block_device *bdev,blk_mode_t mode, +unsigned int cmd,unsigned long param) {int drive = (long )bdev->bd_disk->private_data;int type =ITYPE (drive_state[drive].fd_device);
@@ -3428,7 +3428,8 @@ static int fd_locked_ioctl(struct block_device *bdev, fmode_t mode, unsigned intreturn ret;/* permission checks */ -if (((cmd &0x40 ) && !(mode & (FMODE_WRITE |FMODE_WRITE_IOCTL ))) || +if (((cmd &0x40 ) && + !(mode & (BLK_OPEN_WRITE |BLK_OPEN_WRITE_IOCTL ))) || ((cmd &0x80 ) && !capable (CAP_SYS_ADMIN )))return -EPERM ;
@@ -3566,7 +3567,7 @@ static int fd_locked_ioctl(struct block_device *bdev, fmode_t mode, unsigned intreturn 0 ; } -static int fd_ioctl (struct block_device *bdev,fmode_t mode, +static int fd_ioctl (struct block_device *bdev,blk_mode_t mode,unsigned int cmd,unsigned long param) {int ret;
@@ -3654,8 +3655,8 @@ struct compat_floppy_write_errors {#define FDGETFDCSTAT32 _IOR(2, 0x15, struct compat_floppy_fdc_state)#define FDWERRORGET32 _IOR(2, 0x17, struct compat_floppy_write_errors) -static int compat_set_geometry (struct block_device *bdev,fmode_t mode,unsigned int cmd, -struct compat_floppy_struct __user *arg) +static int compat_set_geometry (struct block_device *bdev,blk_mode_t mode, +unsigned int cmd,struct compat_floppy_struct __user *arg) {struct floppy_struct v;int drive, type;
@@ -3664,7 +3665,7 @@ static int compat_set_geometry(struct block_device *bdev, fmode_t mode, unsignedBUILD_BUG_ON (offsetof(struct floppy_struct , name) != offsetof(struct compat_floppy_struct , name)); -if (!(mode & (FMODE_WRITE |FMODE_WRITE_IOCTL ))) +if (!(mode & (BLK_OPEN_WRITE |BLK_OPEN_WRITE_IOCTL )))return -EPERM ;memset (&v,0 ,sizeof (struct floppy_struct ));
@@ -3861,8 +3862,8 @@ static int compat_werrorget(int drive,return 0 ; } -static int fd_compat_ioctl (struct block_device *bdev,fmode_t mode,unsigned int cmd, -unsigned long param) +static int fd_compat_ioctl (struct block_device *bdev,blk_mode_t mode, +unsigned int cmd,unsigned long param) {int drive = (long )bdev->bd_disk->private_data;switch (cmd) {
@@ -3984,7 +3985,7 @@ static void floppy_release(struct gendisk *disk)* /dev/PS0 etc), and disallows simultaneous access to the same * drive with different device numbers. */ -static int floppy_open (struct gendisk *disk,fmode_t mode) +static int floppy_open (struct gendisk *disk,blk_mode_t mode) {int drive = (long )disk->private_data;int old_dev, new_dev;
@@ -4049,9 +4050,8 @@ static int floppy_open(struct gendisk *disk, fmode_t mode)if (fdc_state[FDC (drive)].rawcmd ==1 ) fdc_state[FDC (drive)].rawcmd =2 ; - -if (!(mode &FMODE_NDELAY )) { -if (mode & (FMODE_READ |FMODE_WRITE )) { +if (!(mode &BLK_OPEN_NDELAY )) { +if (mode & (BLK_OPEN_READ |BLK_OPEN_WRITE )) { drive_state[drive].last_checked =0 ;clear_bit (FD_OPEN_SHOULD_FAIL_BIT , &drive_state[drive].flags);
@@ -4063,7 +4063,7 @@ static int floppy_open(struct gendisk *disk, fmode_t mode) goto out; } res = -EROFS ; -if ((mode &FMODE_WRITE ) && +if ((mode &BLK_OPEN_WRITE ) && !test_bit (FD_DISK_WRITABLE_BIT , &drive_state[drive].flags)) goto out; }
drivers/block/loop.c +10 -12
@@ -990,7 +990,7 @@ loop_set_status_from_info(struct loop_device *lo,return 0 ; } -static int loop_configure (struct loop_device *lo,fmode_t mode, +static int loop_configure (struct loop_device *lo,blk_mode_t mode,struct block_device *bdev,const struct loop_config *config) {
@@ -1014,7 +1014,7 @@ static int loop_configure(struct loop_device *lo, fmode_t mode,* If we don't hold exclusive handle for the device, upgrade to it * here to avoid changing device under exclusive owner. */ -if (!(mode &FMODE_EXCL )) { +if (!(mode &BLK_OPEN_EXCL )) { error =bd_prepare_to_claim (bdev, loop_configure,NULL );if (error) goto out_putf;
@@ -1050,7 +1050,7 @@ static int loop_configure(struct loop_device *lo, fmode_t mode,if (error) goto out_unlock; -if (!(file->f_mode &FMODE_WRITE ) || !(mode &FMODE_WRITE ) || +if (!(file->f_mode &FMODE_WRITE ) || !(mode &BLK_OPEN_WRITE ) || !file->f_op->write_iter) lo->lo_flags |=LO_FLAGS_READ_ONLY ;
@@ -1116,7 +1116,7 @@ static int loop_configure(struct loop_device *lo, fmode_t mode,if (partscan)loop_reread_partitions (lo); -if (!(mode &FMODE_EXCL )) +if (!(mode &BLK_OPEN_EXCL ))bd_abort_claiming (bdev, loop_configure);return 0 ;
@@ -1124,7 +1124,7 @@ static int loop_configure(struct loop_device *lo, fmode_t mode, out_unlock:loop_global_unlock (lo, is_loop); out_bdev: -if (!(mode &FMODE_EXCL )) +if (!(mode &BLK_OPEN_EXCL ))bd_abort_claiming (bdev, loop_configure); out_putf:fput (file);
@@ -1528,7 +1528,7 @@ static int lo_simple_ioctl(struct loop_device *lo, unsigned int cmd,return err; } -static int lo_ioctl (struct block_device *bdev,fmode_t mode, +static int lo_ioctl (struct block_device *bdev,blk_mode_t mode,unsigned int cmd,unsigned long arg) {struct loop_device *lo = bdev->bd_disk->private_data;
@@ -1563,24 +1563,22 @@ static int lo_ioctl(struct block_device *bdev, fmode_t mode,return loop_clr_fd (lo);case LOOP_SET_STATUS : err = -EPERM ; -if ((mode &FMODE_WRITE ) ||capable (CAP_SYS_ADMIN )) { +if ((mode &BLK_OPEN_WRITE ) ||capable (CAP_SYS_ADMIN )) err =loop_set_status_old (lo, argp); - }break ;case LOOP_GET_STATUS :return loop_get_status_old (lo, argp);case LOOP_SET_STATUS64 : err = -EPERM ; -if ((mode &FMODE_WRITE ) ||capable (CAP_SYS_ADMIN )) { +if ((mode &BLK_OPEN_WRITE ) ||capable (CAP_SYS_ADMIN )) err =loop_set_status64 (lo, argp); - }break ;case LOOP_GET_STATUS64 :return loop_get_status64 (lo, argp);case LOOP_SET_CAPACITY :case LOOP_SET_DIRECT_IO :case LOOP_SET_BLOCK_SIZE : -if (!(mode &FMODE_WRITE ) && !capable (CAP_SYS_ADMIN )) +if (!(mode &BLK_OPEN_WRITE ) && !capable (CAP_SYS_ADMIN ))return -EPERM ; fallthrough;default :
@@ -1691,7 +1689,7 @@ loop_get_status_compat(struct loop_device *lo,return err; } -static int lo_compat_ioctl (struct block_device *bdev,fmode_t mode, +static int lo_compat_ioctl (struct block_device *bdev,blk_mode_t mode,unsigned int cmd,unsigned long arg) {struct loop_device *lo = bdev->bd_disk->private_data;
drivers/block/mtip32xx/mtip32xx.c +2 -2
@@ -3041,7 +3041,7 @@ static int rssd_disk_name_format(char *prefix,* structure pointer. */ static int mtip_block_ioctl (struct block_device *dev, -fmode_t mode, +blk_mode_t mode,unsigned cmd,unsigned long arg) {
@@ -3079,7 +3079,7 @@ static int mtip_block_ioctl(struct block_device *dev,* structure pointer. */ static int mtip_block_compat_ioctl (struct block_device *dev, -fmode_t mode, +blk_mode_t mode,unsigned cmd,unsigned long arg) {
drivers/block/nbd.c +2 -2
@@ -1502,7 +1502,7 @@ static int __nbd_ioctl(struct block_device *bdev, struct nbd_device *nbd,return -ENOTTY ; } -static int nbd_ioctl (struct block_device *bdev,fmode_t mode, +static int nbd_ioctl (struct block_device *bdev,blk_mode_t mode,unsigned int cmd,unsigned long arg) {struct nbd_device *nbd = bdev->bd_disk->private_data;
@@ -1553,7 +1553,7 @@ static struct nbd_config *nbd_alloc_config(void)return config; } -static int nbd_open (struct gendisk *disk,fmode_t mode) +static int nbd_open (struct gendisk *disk,blk_mode_t mode) {struct nbd_device *nbd;int ret =0 ;
drivers/block/pktcdvd.c +9 -8
@@ -2113,7 +2113,7 @@ static int pkt_open_write(struct pktcdvd_device *pd)/* * called at open time. */ -static int pkt_open_dev (struct pktcdvd_device *pd,fmode_t write) +static int pkt_open_dev (struct pktcdvd_device *pd,bool write) {int ret;long lba;
@@ -2125,7 +2125,7 @@ static int pkt_open_dev(struct pktcdvd_device *pd, fmode_t write)* to read/write from/to it. It is already opened in O_NONBLOCK mode * so open should not fail. */ - bdev =blkdev_get_by_dev (pd->bdev->bd_dev,FMODE_READ , pd,NULL ); + bdev =blkdev_get_by_dev (pd->bdev->bd_dev,BLK_OPEN_READ , pd,NULL );if (IS_ERR (bdev)) { ret =PTR_ERR (bdev); goto out;
@@ -2203,7 +2203,7 @@ static struct pktcdvd_device *pkt_find_dev_from_minor(unsigned int dev_minor)return pkt_devs[dev_minor]; } -static int pkt_open (struct gendisk *disk,fmode_t mode) +static int pkt_open (struct gendisk *disk,blk_mode_t mode) {struct pktcdvd_device *pd =NULL ;int ret;
@@ -2219,13 +2219,13 @@ static int pkt_open(struct gendisk *disk, fmode_t mode) pd->refcnt++;if (pd->refcnt >1 ) { -if ((mode &FMODE_WRITE ) && +if ((mode &BLK_OPEN_WRITE ) && !test_bit (PACKET_WRITABLE , &pd->flags)) { ret = -EBUSY ; goto out_dec; } }else { - ret =pkt_open_dev (pd, mode &FMODE_WRITE ); + ret =pkt_open_dev (pd, mode &BLK_OPEN_WRITE );if (ret) goto out_dec;/*
@@ -2234,7 +2234,6 @@ static int pkt_open(struct gendisk *disk, fmode_t mode)*/ set_blocksize (disk->part0,CD_FRAMESIZE ); } -mutex_unlock (&ctl_mutex);mutex_unlock (&pktcdvd_mutex);return 0 ;
@@ -2530,7 +2529,8 @@ static int pkt_new_dev(struct pktcdvd_device *pd, dev_t dev) } } - bdev =blkdev_get_by_dev (dev,FMODE_READ |FMODE_NDELAY ,NULL ,NULL ); + bdev =blkdev_get_by_dev (dev,BLK_OPEN_READ |BLK_OPEN_NDELAY ,NULL , +NULL );if (IS_ERR (bdev))return PTR_ERR (bdev); sdev =scsi_device_from_queue (bdev->bd_disk->queue);
@@ -2566,7 +2566,8 @@ static int pkt_new_dev(struct pktcdvd_device *pd, dev_t dev)return -ENOMEM ; } -static int pkt_ioctl (struct block_device *bdev,fmode_t mode,unsigned int cmd,unsigned long arg) +static int pkt_ioctl (struct block_device *bdev,blk_mode_t mode, +unsigned int cmd,unsigned long arg) {struct pktcdvd_device *pd = bdev->bd_disk->private_data;int ret;
drivers/block/rbd.c +1 -1
@@ -660,7 +660,7 @@ static bool pending_result_dec(struct pending_result *pending, int *result)return true; } -static int rbd_open (struct gendisk *disk,fmode_t mode) +static int rbd_open (struct gendisk *disk,blk_mode_t mode) {struct rbd_device *rbd_dev = disk->private_data;bool removing = false;
drivers/block/rnbd/rnbd-clt.c +2 -2
@@ -921,11 +921,11 @@ rnbd_clt_session *find_or_create_sess(const char *sessname, bool *first)return sess; } -static int rnbd_client_open (struct gendisk *disk,fmode_t mode) +static int rnbd_client_open (struct gendisk *disk,blk_mode_t mode) {struct rnbd_clt_dev *dev = disk->private_data; -if (get_disk_ro (dev->gd) && (mode &FMODE_WRITE )) +if (get_disk_ro (dev->gd) && (mode &BLK_OPEN_WRITE ))return -EPERM ; if (dev->dev_state == DEV_STATE_UNMAPPED ||
drivers/block/rnbd/rnbd-srv.c +2 -2
@@ -681,14 +681,14 @@ static int process_msg_open(struct rnbd_srv_session *srv_sess,struct rnbd_srv_sess_dev *srv_sess_dev;const struct rnbd_msg_open *open_msg = msg;struct block_device *bdev; -fmode_t open_flags =FMODE_READ ; +blk_mode_t open_flags =BLK_OPEN_READ ;char *full_path;struct rnbd_msg_open_rsp *rsp = data;trace_process_msg_open (srv_sess, open_msg);if (open_msg->access_mode !=RNBD_ACCESS_RO ) - open_flags |=FMODE_WRITE ; + open_flags |=BLK_OPEN_WRITE ;mutex_lock (&srv_sess->lock);
drivers/block/sunvdc.c +1 -1
@@ -139,7 +139,7 @@ static int vdc_getgeo(struct block_device *bdev, struct hd_geometry *geo)* when vdisk_mtype is VD_MEDIA_TYPE_CD or VD_MEDIA_TYPE_DVD. * Needed to be able to install inside an ldom from an iso image. */ -static int vdc_ioctl (struct block_device *bdev,fmode_t mode, +static int vdc_ioctl (struct block_device *bdev,blk_mode_t mode,unsigned command,unsigned long argument) {struct vdc_port *port = bdev->bd_disk->private_data;
drivers/block/swim.c +7 -9
@@ -608,20 +608,18 @@ static void setup_medium(struct floppy_state *fs) } } -static int floppy_open (struct gendisk *disk,fmode_t mode) +static int floppy_open (struct gendisk *disk,blk_mode_t mode) {struct floppy_state *fs = disk->private_data;struct swim __iomem *base = fs->swd->base;int err; -if (fs->ref_count ==-1 || (fs->ref_count && mode &FMODE_EXCL )) +if (fs->ref_count ==-1 || (fs->ref_count && mode &BLK_OPEN_EXCL ))return -EBUSY ; - -if (mode &FMODE_EXCL ) +if (mode &BLK_OPEN_EXCL ) fs->ref_count =-1 ;else fs->ref_count++; -swim_write (base, setup,S_IBM_DRIVE |S_FCLK_DIV2 );udelay (10 );swim_drive (base, fs->location);
@@ -636,10 +634,10 @@ static int floppy_open(struct gendisk *disk, fmode_t mode)set_capacity (fs->disk, fs->total_secs); -if (mode &FMODE_NDELAY ) +if (mode &BLK_OPEN_NDELAY )return 0 ; -if (mode & (FMODE_READ |FMODE_WRITE )) { +if (mode & (BLK_OPEN_READ |BLK_OPEN_WRITE )) {if (disk_check_media_change (disk) && fs->disk_in) fs->ejected =0 ;if ((mode &FMODE_WRITE ) && fs->write_protected) {
@@ -659,7 +657,7 @@ static int floppy_open(struct gendisk *disk, fmode_t mode)return err; } -static int floppy_unlocked_open (struct gendisk *disk,fmode_t mode) +static int floppy_unlocked_open (struct gendisk *disk,blk_mode_t mode) {int ret;
@@ -686,7 +684,7 @@ static void floppy_release(struct gendisk *disk)mutex_unlock (&swim_mutex); } -static int floppy_ioctl (struct block_device *bdev,fmode_t mode, +static int floppy_ioctl (struct block_device *bdev,blk_mode_t mode,unsigned int cmd,unsigned long param) {struct floppy_state *fs = bdev->bd_disk->private_data;
drivers/block/swim3.c +12 -12
@@ -246,9 +246,9 @@ static int grab_drive(struct floppy_state *fs, enum swim_state state, int interruptible);static void release_drive (struct floppy_state *fs);static int fd_eject (struct floppy_state *fs); -static int floppy_ioctl (struct block_device *bdev,fmode_t mode, +static int floppy_ioctl (struct block_device *bdev,blk_mode_t mode,unsigned int cmd,unsigned long param); -static int floppy_open (struct gendisk *disk,fmode_t mode); +static int floppy_open (struct gendisk *disk,blk_mode_t mode);static unsigned int floppy_check_events (struct gendisk *disk,unsigned int clearing);static int floppy_revalidate (struct gendisk *disk);
@@ -882,7 +882,7 @@ static int fd_eject(struct floppy_state *fs)static struct floppy_struct floppy_type = {2880 ,18 ,2 ,80 ,0 ,0x1B ,0x00 ,0xCF ,0x6C ,NULL };/* 7 1.44MB 3.5" */ -static int floppy_locked_ioctl (struct block_device *bdev,fmode_t mode, +static int floppy_locked_ioctl (struct block_device *bdev,unsigned int cmd,unsigned long param) {struct floppy_state *fs = bdev->bd_disk->private_data;
@@ -910,7 +910,7 @@ static int floppy_locked_ioctl(struct block_device *bdev, fmode_t mode,return -ENOTTY ; } -static int floppy_ioctl (struct block_device *bdev,fmode_t mode, +static int floppy_ioctl (struct block_device *bdev,blk_mode_t mode,unsigned int cmd,unsigned long param) {int ret;
@@ -922,7 +922,7 @@ static int floppy_ioctl(struct block_device *bdev, fmode_t mode,return ret; } -static int floppy_open (struct gendisk *disk,fmode_t mode) +static int floppy_open (struct gendisk *disk,blk_mode_t mode) {struct floppy_state *fs = disk->private_data;struct swim3 __iomem *sw = fs->swim3;
@@ -957,18 +957,18 @@ static int floppy_open(struct gendisk *disk, fmode_t mode)swim3_action (fs,SETMFM );swim3_select (fs,RELAX ); - }else if (fs->ref_count ==-1 || mode &FMODE_EXCL ) + }else if (fs->ref_count ==-1 || mode &BLK_OPEN_EXCL )return -EBUSY ; -if (err ==0 && (mode &FMODE_NDELAY ) ==0 - && (mode & (FMODE_READ |FMODE_WRITE ))) { +if (err ==0 && !(mode &BLK_OPEN_NDELAY ) && + (mode & (BLK_OPEN_READ |BLK_OPEN_WRITE ))) {if (disk_check_media_change (disk))floppy_revalidate (disk);if (fs->ejected) err = -ENXIO ; } -if (err ==0 && (mode &FMODE_WRITE )) { +if (err ==0 && (mode &BLK_OPEN_WRITE )) {if (fs->write_prot <0 ) fs->write_prot =swim3_readbit (fs,WRITE_PROT );if (fs->write_prot)
@@ -984,7 +984,7 @@ static int floppy_open(struct gendisk *disk, fmode_t mode)return err; } -if (mode &FMODE_EXCL ) +if (mode &BLK_OPEN_EXCL ) fs->ref_count =-1 ;else ++fs->ref_count;
@@ -992,12 +992,12 @@ static int floppy_open(struct gendisk *disk, fmode_t mode)return 0 ; } -static int floppy_unlocked_open (struct block_device *bdev,fmode_t mode) +static int floppy_unlocked_open (struct gendisk *disk,blk_mode_t mode) {int ret;mutex_lock (&swim3_mutex); - ret =floppy_open (bdev, mode); + ret =floppy_open (disk, mode);mutex_unlock (&swim3_mutex);return ret;
drivers/block/ublk_drv.c +1 -1
@@ -447,7 +447,7 @@ static void ublk_store_owner_uid_gid(unsigned int *owner_uid, *owner_gid =from_kgid (&init_user_ns, gid); } -static int ublk_open (struct gendisk *disk,fmode_t mode) +static int ublk_open (struct gendisk *disk,blk_mode_t mode) {struct ublk_device *ub = disk->private_data;
drivers/block/xen-blkback/xenbus.c +1 -1
@@ -492,7 +492,7 @@ static int xen_vbd_create(struct xen_blkif *blkif, blkif_vdev_t handle, vbd->pdevice =MKDEV (major, minor); bdev =blkdev_get_by_dev (vbd->pdevice, vbd->readonly ? -FMODE_READ :FMODE_WRITE ,NULL ,NULL ); +BLK_OPEN_READ :BLK_OPEN_WRITE ,NULL ,NULL );if (IS_ERR (bdev)) { pr_warn("xen_vbd_create: device %08x could not be opened\n",
drivers/block/xen-blkfront.c +1 -1
@@ -509,7 +509,7 @@ static int blkif_getgeo(struct block_device *bd, struct hd_geometry *hg)return 0 ; } -static int blkif_ioctl (struct block_device *bdev,fmode_t mode, +static int blkif_ioctl (struct block_device *bdev,blk_mode_t mode,unsigned command,unsigned long argument) {struct blkfront_info *info = bdev->bd_disk->private_data;
drivers/block/z2ram.c +1 -1
@@ -140,7 +140,7 @@ static void get_chipram(void)return ; } -static int z2_open (struct gendisk *disk,fmode_t mode) +static int z2_open (struct gendisk *disk,blk_mode_t mode) {int device = disk->first_minor;int max_z2_map = (Z2RAM_SIZE /Z2RAM_CHUNKSIZE ) *sizeof (z2ram_map[0 ]);
drivers/block/zram/zram_drv.c +3 -3
@@ -507,8 +507,8 @@ static ssize_t backing_dev_store(struct device *dev, goto out; } - bdev =blkdev_get_by_dev (inode->i_rdev,FMODE_READ |FMODE_WRITE , zram, -NULL ); + bdev =blkdev_get_by_dev (inode->i_rdev,BLK_OPEN_READ |BLK_OPEN_WRITE , + zram,NULL );if (IS_ERR (bdev)) { err =PTR_ERR (bdev); bdev =NULL ;
@@ -2097,7 +2097,7 @@ static ssize_t reset_store(struct device *dev,return len; } -static int zram_open (struct gendisk *disk,fmode_t mode) +static int zram_open (struct gendisk *disk,blk_mode_t mode) {struct zram *zram = disk->private_data;
drivers/cdrom/cdrom.c +2 -2
@@ -1146,7 +1146,7 @@ int open_for_data(struct cdrom_device_info *cdi)* is in their own interest: device control becomes a lot easier * this way. */ -int cdrom_open (struct cdrom_device_info *cdi,fmode_t mode) +int cdrom_open (struct cdrom_device_info *cdi,blk_mode_t mode) {int ret;
@@ -1155,7 +1155,7 @@ int cdrom_open(struct cdrom_device_info *cdi, fmode_t mode)/* if this was a O_NONBLOCK open and we should honor the flags, * do a quick open without drive/disc integrity checks. */ cdi->use_count++; -if ((mode &FMODE_NDELAY ) && (cdi->options &CDO_USE_FFLAGS )) { +if ((mode &BLK_OPEN_NDELAY ) && (cdi->options &CDO_USE_FFLAGS )) { ret = cdi->ops->open (cdi,1 ); }else { ret =open_for_data (cdi);
drivers/cdrom/gdrom.c +2 -2
@@ -474,7 +474,7 @@ static const struct cdrom_device_ops gdrom_ops = { CDC_RESET | CDC_DRIVE_STATUS | CDC_CD_R, }; -static int gdrom_bdops_open (struct gendisk *disk,fmode_t mode) +static int gdrom_bdops_open (struct gendisk *disk,blk_mode_t mode) {int ret;
@@ -499,7 +499,7 @@ static unsigned int gdrom_bdops_check_events(struct gendisk *disk,return cdrom_check_events (gd.cd_info, clearing); } -static int gdrom_bdops_ioctl (struct block_device *bdev,fmode_t mode, +static int gdrom_bdops_ioctl (struct block_device *bdev,blk_mode_t mode,unsigned cmd,unsigned long arg) {int ret;
drivers/md/bcache/bcache.h +1 -1
@@ -275,7 +275,7 @@ struct bcache_device {int (*cache_miss)(struct btree *b,struct search *s,struct bio *bio,unsigned int sectors); -int (*ioctl)(struct bcache_device *d,fmode_t mode, +int (*ioctl)(struct bcache_device *d,blk_mode_t mode,unsigned int cmd,unsigned long arg); };
drivers/md/bcache/request.c +2 -2
@@ -1228,7 +1228,7 @@ void cached_dev_submit_bio(struct bio *bio)detached_dev_do_request (d, bio, orig_bdev, start_time); } -static int cached_dev_ioctl (struct bcache_device *d,fmode_t mode, +static int cached_dev_ioctl (struct bcache_device *d,blk_mode_t mode,unsigned int cmd,unsigned long arg) { struct cached_dev *dc = container_of(d, struct cached_dev, disk);
@@ -1318,7 +1318,7 @@ void flash_dev_submit_bio(struct bio *bio)continue_at (cl, search_free,NULL ); } -static int flash_dev_ioctl (struct bcache_device *d,fmode_t mode, +static int flash_dev_ioctl (struct bcache_device *d,blk_mode_t mode,unsigned int cmd,unsigned long arg) {return -ENOTTY ;
drivers/md/bcache/super.c +3 -3
@@ -732,7 +732,7 @@ static int prio_read(struct cache *ca, uint64_t bucket)/* Bcache device */ -static int open_dev (struct gendisk *disk,fmode_t mode) +static int open_dev (struct gendisk *disk,blk_mode_t mode) {struct bcache_device *d = disk->private_data;
@@ -750,7 +750,7 @@ static void release_dev(struct gendisk *b)closure_put (&d->cl); } -static int ioctl_dev (struct block_device *b,fmode_t mode, +static int ioctl_dev (struct block_device *b,blk_mode_t mode,unsigned int cmd,unsigned long arg) {struct bcache_device *d = b->bd_disk->private_data;
@@ -2558,7 +2558,7 @@ static ssize_t register_bcache(struct kobject *k, struct kobj_attribute *attr, ret = -EINVAL ; err ="failed to open device" ; - bdev =blkdev_get_by_path (strim (path),FMODE_READ |FMODE_WRITE , + bdev =blkdev_get_by_path (strim (path),BLK_OPEN_READ |BLK_OPEN_WRITE , bcache_kobj,NULL );if (IS_ERR (bdev)) {if (bdev ==ERR_PTR (-EBUSY )) {
drivers/md/dm-cache-target.c +6 -6
@@ -2051,8 +2051,8 @@ static int parse_metadata_dev(struct cache_args *ca, struct dm_arg_set *as,if (!at_least_one_arg (as, error))return -EINVAL ; - r =dm_get_device (ca->ti,dm_shift_arg (as),FMODE_READ |FMODE_WRITE , - &ca->metadata_dev); + r =dm_get_device (ca->ti,dm_shift_arg (as), +BLK_OPEN_READ |BLK_OPEN_WRITE , &ca->metadata_dev);if (r) { *error ="Error opening metadata device" ;return r;
@@ -2074,8 +2074,8 @@ static int parse_cache_dev(struct cache_args *ca, struct dm_arg_set *as,if (!at_least_one_arg (as, error))return -EINVAL ; - r =dm_get_device (ca->ti,dm_shift_arg (as),FMODE_READ |FMODE_WRITE , - &ca->cache_dev); + r =dm_get_device (ca->ti,dm_shift_arg (as), +BLK_OPEN_READ |BLK_OPEN_WRITE , &ca->cache_dev);if (r) { *error ="Error opening cache device" ;return r;
@@ -2093,8 +2093,8 @@ static int parse_origin_dev(struct cache_args *ca, struct dm_arg_set *as,if (!at_least_one_arg (as, error))return -EINVAL ; - r =dm_get_device (ca->ti,dm_shift_arg (as),FMODE_READ |FMODE_WRITE , - &ca->origin_dev); + r =dm_get_device (ca->ti,dm_shift_arg (as), +BLK_OPEN_READ |BLK_OPEN_WRITE , &ca->origin_dev);if (r) { *error ="Error opening origin device" ;return r;
drivers/md/dm-clone-target.c +5 -5
@@ -1683,8 +1683,8 @@ static int parse_metadata_dev(struct clone *clone, struct dm_arg_set *as, char *int r;sector_t metadata_dev_size; - r =dm_get_device (clone->ti,dm_shift_arg (as),FMODE_READ |FMODE_WRITE , - &clone->metadata_dev); + r =dm_get_device (clone->ti,dm_shift_arg (as), +BLK_OPEN_READ |BLK_OPEN_WRITE , &clone->metadata_dev);if (r) { *error ="Error opening metadata device" ;return r;
@@ -1703,8 +1703,8 @@ static int parse_dest_dev(struct clone *clone, struct dm_arg_set *as, char **errint r;sector_t dest_dev_size; - r =dm_get_device (clone->ti,dm_shift_arg (as),FMODE_READ |FMODE_WRITE , - &clone->dest_dev); + r =dm_get_device (clone->ti,dm_shift_arg (as), +BLK_OPEN_READ |BLK_OPEN_WRITE , &clone->dest_dev);if (r) { *error ="Error opening destination device" ;return r;
@@ -1725,7 +1725,7 @@ static int parse_source_dev(struct clone *clone, struct dm_arg_set *as, char **eint r;sector_t source_dev_size; - r =dm_get_device (clone->ti,dm_shift_arg (as),FMODE_READ , + r =dm_get_device (clone->ti,dm_shift_arg (as),BLK_OPEN_READ , &clone->source_dev);if (r) { *error ="Error opening source device" ;
drivers/md/dm-core.h +3 -4
@@ -207,11 +207,10 @@ struct dm_table { unsigned integrity_added:1;/* -* Indicates the rw permissions for the new logical -* device. This should be a combination of FMODE_READ -* and FMODE_WRITE. +* Indicates the rw permissions for the new logical device. This +* should be a combination of BLK_OPEN_READ and BLK_OPEN_WRITE. */ -fmode_t mode; +blk_mode_t mode;/* a list of devices used by this table */ struct list_head devices;
drivers/md/dm-era-target.c +4 -2
@@ -1482,14 +1482,16 @@ static int era_ctr(struct dm_target *ti, unsigned int argc, char **argv) era->ti = ti; - r =dm_get_device (ti, argv[0 ],FMODE_READ |FMODE_WRITE , &era->metadata_dev); + r =dm_get_device (ti, argv[0 ],BLK_OPEN_READ |BLK_OPEN_WRITE , + &era->metadata_dev);if (r) { ti->error ="Error opening metadata device" ;era_destroy (era);return -EINVAL ; } - r =dm_get_device (ti, argv[1 ],FMODE_READ |FMODE_WRITE , &era->origin_dev); + r =dm_get_device (ti, argv[1 ],BLK_OPEN_READ |BLK_OPEN_WRITE , + &era->origin_dev);if (r) { ti->error ="Error opening data device" ;era_destroy (era);
drivers/md/dm-ioctl.c +5 -5
@@ -861,7 +861,7 @@ static void __dev_status(struct mapped_device *md, struct dm_ioctl *param) table =dm_get_inactive_table (md, &srcu_idx);if (table) { -if (!(dm_table_get_mode (table) &FMODE_WRITE )) +if (!(dm_table_get_mode (table) &BLK_OPEN_WRITE )) param->flags |=DM_READONLY_FLAG ; param->target_count = table->num_targets; }
@@ -1192,7 +1192,7 @@ static int do_resume(struct dm_ioctl *param)if (old_size && new_size && old_size != new_size) need_resize_uevent = true; -if (dm_table_get_mode (new_map) &FMODE_WRITE ) +if (dm_table_get_mode (new_map) &BLK_OPEN_WRITE )set_disk_ro (dm_disk (md),0 );else set_disk_ro (dm_disk (md),1 );
@@ -1381,12 +1381,12 @@ static int dev_arm_poll(struct file *filp, struct dm_ioctl *param, size_t param_return 0 ; } -static inline fmode_t get_mode (struct dm_ioctl *param) +static inline blk_mode_t get_mode (struct dm_ioctl *param) { -fmode_t mode =FMODE_READ |FMODE_WRITE ; +blk_mode_t mode =BLK_OPEN_READ |BLK_OPEN_WRITE ;if (param->flags &DM_READONLY_FLAG ) - mode =FMODE_READ ; + mode =BLK_OPEN_READ ;return mode; }
drivers/md/dm-snap.c +2 -2
@@ -1242,7 +1242,7 @@ static int snapshot_ctr(struct dm_target *ti, unsigned int argc, char **argv)int r = -EINVAL ;char *origin_path, *cow_path;unsigned int args_used, num_flush_bios =1 ; -fmode_t origin_mode =FMODE_READ ; +blk_mode_t origin_mode =BLK_OPEN_READ ;if (argc <4 ) { ti->error ="requires 4 or more arguments" ;
@@ -1252,7 +1252,7 @@ static int snapshot_ctr(struct dm_target *ti, unsigned int argc, char **argv)if (dm_target_is_snapshot_merge (ti)) { num_flush_bios =2 ; - origin_mode =FMODE_WRITE ; + origin_mode =BLK_OPEN_WRITE ; } s =kzalloc (sizeof (*s),GFP_KERNEL );
drivers/md/dm-table.c +6 -5
@@ -126,7 +126,7 @@ static int alloc_targets(struct dm_table *t, unsigned int num)return 0 ; } -int dm_table_create (struct dm_table **result,fmode_t mode, +int dm_table_create (struct dm_table **result,blk_mode_t mode,unsigned int num_targets,struct mapped_device *md) {struct dm_table *t =kzalloc (sizeof (*t),GFP_KERNEL );
@@ -304,7 +304,7 @@ static int device_area_is_invalid(struct dm_target *ti, struct dm_dev *dev,* device and not to touch the existing bdev field in case * it is accessed concurrently. */ -static int upgrade_mode (struct dm_dev_internal *dd,fmode_t new_mode, +static int upgrade_mode (struct dm_dev_internal *dd,blk_mode_t new_mode,struct mapped_device *md) {int r;
@@ -330,7 +330,7 @@ static int upgrade_mode(struct dm_dev_internal *dd, fmode_t new_mode,* Note: the __ref annotation is because this function can call the __init * marked early_lookup_bdev when called during early boot code from dm-init.c. */ -int __ref dm_get_device (struct dm_target *ti,const char *path,fmode_t mode, +int __ref dm_get_device (struct dm_target *ti,const char *path,blk_mode_t mode,struct dm_dev **result) {int r;
@@ -662,7 +662,8 @@ int dm_table_add_target(struct dm_table *t, const char *type, t->singleton = true; } -if (dm_target_always_writeable (ti->type) && !(t->mode &FMODE_WRITE )) { +if (dm_target_always_writeable (ti->type) && + !(t->mode &BLK_OPEN_WRITE )) { ti->error ="target type may not be included in a read-only table" ; goto bad; }
@@ -2033,7 +2034,7 @@ struct list_head *dm_table_get_devices(struct dm_table *t)return &t->devices; } -fmode_t dm_table_get_mode (struct dm_table *t) +blk_mode_t dm_table_get_mode (struct dm_table *t) {return t->mode; }
drivers/md/dm-thin.c +5 -4
@@ -3301,7 +3301,7 @@ static int pool_ctr(struct dm_target *ti, unsigned int argc, char **argv)unsigned long block_size;dm_block_t low_water_blocks;struct dm_dev *metadata_dev; -fmode_t metadata_mode; +blk_mode_t metadata_mode;/* * FIXME Remove validation from scope of lock.
@@ -3334,7 +3334,8 @@ static int pool_ctr(struct dm_target *ti, unsigned int argc, char **argv)if (r) goto out_unlock; - metadata_mode =FMODE_READ | ((pf.mode ==PM_READ_ONLY ) ?0 :FMODE_WRITE ); + metadata_mode =BLK_OPEN_READ | + ((pf.mode ==PM_READ_ONLY ) ?0 :BLK_OPEN_WRITE ); r =dm_get_device (ti, argv[0 ], metadata_mode, &metadata_dev);if (r) { ti->error ="Error opening metadata block device" ;
@@ -3342,7 +3343,7 @@ static int pool_ctr(struct dm_target *ti, unsigned int argc, char **argv) }warn_if_metadata_device_too_big (metadata_dev->bdev); - r =dm_get_device (ti, argv[1 ],FMODE_READ |FMODE_WRITE , &data_dev); + r =dm_get_device (ti, argv[1 ],BLK_OPEN_READ |BLK_OPEN_WRITE , &data_dev);if (r) { ti->error ="Error getting data device" ; goto out_metadata;
@@ -4223,7 +4224,7 @@ static int thin_ctr(struct dm_target *ti, unsigned int argc, char **argv) goto bad_origin_dev; } - r =dm_get_device (ti, argv[2 ],FMODE_READ , &origin_dev); + r =dm_get_device (ti, argv[2 ],BLK_OPEN_READ , &origin_dev);if (r) { ti->error ="Error opening origin device" ; goto bad_origin_dev;
drivers/md/dm-verity-fec.c +1 -1
@@ -607,7 +607,7 @@ int verity_fec_parse_opt_args(struct dm_arg_set *as, struct dm_verity *v, (*argc)--;if (!strcasecmp (arg_name,DM_VERITY_OPT_FEC_DEV )) { - r =dm_get_device (ti, arg_value,FMODE_READ , &v->fec->dev); + r =dm_get_device (ti, arg_value,BLK_OPEN_READ , &v->fec->dev);if (r) { ti->error ="FEC device lookup failed" ;return r;
drivers/md/dm-verity-target.c +3 -3
@@ -1196,7 +1196,7 @@ static int verity_ctr(struct dm_target *ti, unsigned int argc, char **argv)if (r) goto bad; -if ((dm_table_get_mode (ti->table) & ~FMODE_READ )) { +if ((dm_table_get_mode (ti->table) & ~BLK_OPEN_READ )) { ti->error ="Device must be readonly" ; r = -EINVAL ; goto bad;
@@ -1225,13 +1225,13 @@ static int verity_ctr(struct dm_target *ti, unsigned int argc, char **argv) } v->version = num; - r =dm_get_device (ti, argv[1 ],FMODE_READ , &v->data_dev); + r =dm_get_device (ti, argv[1 ],BLK_OPEN_READ , &v->data_dev);if (r) { ti->error ="Data device lookup failed" ; goto bad; } - r =dm_get_device (ti, argv[2 ],FMODE_READ , &v->hash_dev); + r =dm_get_device (ti, argv[2 ],BLK_OPEN_READ , &v->hash_dev);if (r) { ti->error ="Hash device lookup failed" ; goto bad;
drivers/md/dm.c +5 -5
@@ -310,7 +310,7 @@ int dm_deleting_md(struct mapped_device *md)return test_bit (DMF_DELETING , &md->flags); } -static int dm_blk_open (struct gendisk *disk,fmode_t mode) +static int dm_blk_open (struct gendisk *disk,blk_mode_t mode) {struct mapped_device *md;
@@ -448,7 +448,7 @@ static void dm_unprepare_ioctl(struct mapped_device *md, int srcu_idx)dm_put_live_table (md, srcu_idx); } -static int dm_blk_ioctl (struct block_device *bdev,fmode_t mode, +static int dm_blk_ioctl (struct block_device *bdev,blk_mode_t mode,unsigned int cmd,unsigned long arg) {struct mapped_device *md = bdev->bd_disk->private_data;
@@ -734,7 +734,7 @@ static char *_dm_claim_ptr = "I belong to device-mapper";* Open a table device so we can use it as a map destination. */ static struct table_device *open_table_device (struct mapped_device *md, -dev_t dev,fmode_t mode) +dev_t dev,blk_mode_t mode) {struct table_device *td;struct block_device *bdev;
@@ -791,7 +791,7 @@ static void close_table_device(struct table_device *td, struct mapped_device *md }static struct table_device *find_table_device (struct list_head *l,dev_t dev, -fmode_t mode) +blk_mode_t mode) {struct table_device *td;
@@ -802,7 +802,7 @@ static struct table_device *find_table_device(struct list_head *l, dev_t dev,return NULL ; } -int dm_get_table_device (struct mapped_device *md,dev_t dev,fmode_t mode, +int dm_get_table_device (struct mapped_device *md,dev_t dev,blk_mode_t mode,struct dm_dev **result) {struct table_device *td;
drivers/md/dm.h +1 -1
@@ -203,7 +203,7 @@ int dm_open_count(struct mapped_device *md);int dm_lock_for_deletion (struct mapped_device *md,bool mark_deferred,bool only_deferred);int dm_cancel_deferred_remove (struct mapped_device *md);int dm_request_based (struct mapped_device *md); -int dm_get_table_device (struct mapped_device *md,dev_t dev,fmode_t mode, +int dm_get_table_device (struct mapped_device *md,dev_t dev,blk_mode_t mode,struct dm_dev **result);void dm_put_table_device (struct mapped_device *md,struct dm_dev *d);
drivers/md/md.c +4 -4
@@ -3643,7 +3643,7 @@ static struct md_rdev *md_import_device(dev_t newdev, int super_format, int supeif (err) goto out_clear_rdev; - rdev->bdev =blkdev_get_by_dev (newdev,FMODE_READ |FMODE_WRITE , + rdev->bdev =blkdev_get_by_dev (newdev,BLK_OPEN_READ |BLK_OPEN_WRITE , super_format ==-2 ? &claim_rdev : rdev,NULL );if (IS_ERR (rdev->bdev)) { pr_warn("md: could not open device unknown-block(%u,%u).\n",
@@ -7488,7 +7488,7 @@ static int __md_set_array_info(struct mddev *mddev, void __user *argp)return err; } -static int md_ioctl (struct block_device *bdev,fmode_t mode, +static int md_ioctl (struct block_device *bdev,blk_mode_t mode,unsigned int cmd,unsigned long arg) {int err =0 ;
@@ -7720,7 +7720,7 @@ static int md_ioctl(struct block_device *bdev, fmode_t mode,return err; }#ifdef CONFIG_COMPAT -static int md_compat_ioctl (struct block_device *bdev,fmode_t mode, +static int md_compat_ioctl (struct block_device *bdev,blk_mode_t mode,unsigned int cmd,unsigned long arg) {switch (cmd) {
@@ -7769,7 +7769,7 @@ static int md_set_read_only(struct block_device *bdev, bool ro)return err; } -static int md_open (struct gendisk *disk,fmode_t mode) +static int md_open (struct gendisk *disk,blk_mode_t mode) {struct mddev *mddev;int err;
drivers/mmc/core/block.c +4 -4
@@ -357,7 +357,7 @@ static const struct attribute_group *mmc_disk_attr_groups[] = { NULL, }; -static int mmc_blk_open (struct gendisk *disk,fmode_t mode) +static int mmc_blk_open (struct gendisk *disk,blk_mode_t mode) {struct mmc_blk_data *md =mmc_blk_get (disk);int ret = -ENXIO ;
@@ -365,7 +365,7 @@ static int mmc_blk_open(struct gendisk *disk, fmode_t mode)mutex_lock (&block_mutex);if (md) { ret =0 ; -if ((mode &FMODE_WRITE ) && md->read_only) { +if ((mode &BLK_OPEN_WRITE ) && md->read_only) {mmc_blk_put (md); ret = -EROFS ; }
@@ -754,7 +754,7 @@ static int mmc_blk_check_blkdev(struct block_device *bdev)return 0 ; } -static int mmc_blk_ioctl (struct block_device *bdev,fmode_t mode, +static int mmc_blk_ioctl (struct block_device *bdev,blk_mode_t mode,unsigned int cmd,unsigned long arg) {struct mmc_blk_data *md;
@@ -791,7 +791,7 @@ static int mmc_blk_ioctl(struct block_device *bdev, fmode_t mode, }#ifdef CONFIG_COMPAT -static int mmc_blk_compat_ioctl (struct block_device *bdev,fmode_t mode, +static int mmc_blk_compat_ioctl (struct block_device *bdev,blk_mode_t mode,unsigned int cmd,unsigned long arg) {return mmc_blk_ioctl (bdev, mode, cmd, (unsigned long )compat_ptr (arg));
drivers/mtd/devices/block2mtd.c +2 -2
@@ -220,7 +220,7 @@ static void block2mtd_free_device(struct block2mtd_dev *dev)* early_lookup_bdev when called from the early boot code. */ static struct block_device __ref *mdtblock_early_get_bdev (const char *devname, -fmode_t mode,int timeout,struct block2mtd_dev *dev) +blk_mode_t mode,int timeout,struct block2mtd_dev *dev) {struct block_device *bdev =ERR_PTR (-ENODEV );#ifndef MODULE
@@ -261,7 +261,7 @@ static struct block_device __ref *mdtblock_early_get_bdev(const char *devname,static struct block2mtd_dev *add_device (char *devname,int erase_size,char *label,int timeout) { -const fmode_t mode =FMODE_READ |FMODE_WRITE ; +const blk_mode_t mode =BLK_OPEN_READ |BLK_OPEN_WRITE ;struct block_device *bdev;struct block2mtd_dev *dev;char *name;
drivers/mtd/mtd_blkdevs.c +2 -2
@@ -182,7 +182,7 @@ static blk_status_t mtd_queue_rq(struct blk_mq_hw_ctx *hctx,return BLK_STS_OK ; } -static int blktrans_open (struct gendisk *disk,fmode_t mode) +static int blktrans_open (struct gendisk *disk,blk_mode_t mode) {struct mtd_blktrans_dev *dev = disk->private_data;int ret =0 ;
@@ -208,7 +208,7 @@ static int blktrans_open(struct gendisk *disk, fmode_t mode) ret =__get_mtd_device (dev->mtd);if (ret) goto error_release; - dev->writable = mode &FMODE_WRITE ; + dev->writable = mode &BLK_OPEN_WRITE ; unlock: dev->open++;
drivers/mtd/ubi/block.c +2 -3
@@ -227,7 +227,7 @@ static blk_status_t ubiblock_read(struct request *req)return BLK_STS_OK ; } -static int ubiblock_open (struct gendisk *disk,fmode_t mode) +static int ubiblock_open (struct gendisk *disk,blk_mode_t mode) {struct ubiblock *dev = disk->private_data;int ret;
@@ -246,11 +246,10 @@ static int ubiblock_open(struct gendisk *disk, fmode_t mode)* It's just a paranoid check, as write requests will get rejected * in any case. */ -if (mode &FMODE_WRITE ) { +if (mode &BLK_OPEN_WRITE ) { ret = -EROFS ; goto out_unlock; } - dev->desc =ubi_open_volume (dev->ubi_num, dev->vol_id,UBI_READONLY );if (IS_ERR (dev->desc)) { dev_err(disk_to_dev(dev->gd), "failed to open ubi volume %d_%d",
drivers/nvme/host/core.c +1 -1
@@ -1591,7 +1591,7 @@ static void nvme_ns_release(struct nvme_ns *ns)nvme_put_ns (ns); } -static int nvme_open (struct gendisk *disk,fmode_t mode) +static int nvme_open (struct gendisk *disk,blk_mode_t mode) {return nvme_ns_open (disk->private_data); }
drivers/nvme/host/ioctl.c +4 -4
@@ -709,11 +709,11 @@ static int nvme_ns_ioctl(struct nvme_ns *ns, unsigned int cmd, } } -int nvme_ioctl (struct block_device *bdev,fmode_t mode, +int nvme_ioctl (struct block_device *bdev,blk_mode_t mode,unsigned int cmd,unsigned long arg) {struct nvme_ns *ns = bdev->bd_disk->private_data; -bool open_for_write = mode &FMODE_WRITE ; +bool open_for_write = mode &BLK_OPEN_WRITE ;void __user *argp = (void __user *)arg;unsigned int flags =0 ;
@@ -817,11 +817,11 @@ static int nvme_ns_head_ctrl_ioctl(struct nvme_ns *ns, unsigned int cmd,return ret; } -int nvme_ns_head_ioctl (struct block_device *bdev,fmode_t mode, +int nvme_ns_head_ioctl (struct block_device *bdev,blk_mode_t mode,unsigned int cmd,unsigned long arg) {struct nvme_ns_head *head = bdev->bd_disk->private_data; -bool open_for_write = mode &FMODE_WRITE ; +bool open_for_write = mode &BLK_OPEN_WRITE ;void __user *argp = (void __user *)arg;struct nvme_ns *ns;int srcu_idx, ret = -EWOULDBLOCK ;
drivers/nvme/host/multipath.c +1 -1
@@ -402,7 +402,7 @@ static void nvme_ns_head_submit_bio(struct bio *bio)srcu_read_unlock (&head->srcu, srcu_idx); } -static int nvme_ns_head_open (struct gendisk *disk,fmode_t mode) +static int nvme_ns_head_open (struct gendisk *disk,blk_mode_t mode) {if (!nvme_tryget_ns_head (disk->private_data))return -ENXIO ;
drivers/nvme/host/nvme.h +2 -2
@@ -836,10 +836,10 @@ void nvme_put_ns_head(struct nvme_ns_head *head);int nvme_cdev_add (struct cdev *cdev,struct device *cdev_device,const struct file_operations *fops,struct module *owner);void nvme_cdev_del (struct cdev *cdev,struct device *cdev_device); -int nvme_ioctl (struct block_device *bdev,fmode_t mode, +int nvme_ioctl (struct block_device *bdev,blk_mode_t mode,unsigned int cmd,unsigned long arg);long nvme_ns_chr_ioctl (struct file *file,unsigned int cmd,unsigned long arg); -int nvme_ns_head_ioctl (struct block_device *bdev,fmode_t mode, +int nvme_ns_head_ioctl (struct block_device *bdev,blk_mode_t mode,unsigned int cmd,unsigned long arg);long nvme_ns_head_chr_ioctl (struct file *file,unsigned int cmd,unsigned long arg);
drivers/nvme/target/io-cmd-bdev.c +1 -1
@@ -85,7 +85,7 @@ int nvmet_bdev_ns_enable(struct nvmet_ns *ns)return -ENOTBLK ; ns->bdev =blkdev_get_by_path (ns->device_path, -FMODE_READ |FMODE_WRITE ,NULL ,NULL ); +BLK_OPEN_READ |BLK_OPEN_WRITE ,NULL ,NULL );if (IS_ERR (ns->bdev)) { ret =PTR_ERR (ns->bdev);if (ret != -ENOTBLK ) {
drivers/s390/block/dasd.c +2 -4
@@ -3234,7 +3234,7 @@ struct blk_mq_ops dasd_mq_ops = { .exit_hctx = dasd_exit_hctx, }; -static int dasd_open (struct gendisk *disk,fmode_t mode) +static int dasd_open (struct gendisk *disk,blk_mode_t mode) {struct dasd_device *base;int rc;
@@ -3268,14 +3268,12 @@ static int dasd_open(struct gendisk *disk, fmode_t mode) rc = -ENODEV ; goto out; } - -if ((mode &FMODE_WRITE ) && +if ((mode &BLK_OPEN_WRITE ) && (test_bit (DASD_FLAG_DEVICE_RO , &base->flags) || (base->features &DASD_FEATURE_READONLY ))) { rc = -EROFS ; goto out; } -dasd_put_device (base);return 0 ;
drivers/s390/block/dasd_genhd.c +2 -1
@@ -130,7 +130,8 @@ int dasd_scan_partitions(struct dasd_block *block)struct block_device *bdev;int rc; - bdev =blkdev_get_by_dev (disk_devt (block->gdp),FMODE_READ ,NULL ,NULL ); + bdev =blkdev_get_by_dev (disk_devt (block->gdp),BLK_OPEN_READ ,NULL , +NULL );if (IS_ERR (bdev)) { DBF_DEV_EVENT(DBF_ERR, block->base, "scan partitions error, blkdev_get returned %ld",
drivers/s390/block/dasd_int.h +2 -1
@@ -965,7 +965,8 @@ int dasd_scan_partitions(struct dasd_block *);void dasd_destroy_partitions (struct dasd_block *);/* externals in dasd_ioctl.c */ -int dasd_ioctl (struct block_device *,fmode_t ,unsigned int ,unsigned long ); +int dasd_ioctl (struct block_device *bdev,blk_mode_t mode,unsigned int cmd, +unsigned long arg);int dasd_set_read_only (struct block_device *bdev,bool ro);/* externals in dasd_proc.c */
drivers/s390/block/dasd_ioctl.c +1 -1
@@ -612,7 +612,7 @@ static int dasd_ioctl_readall_cmb(struct dasd_block *block, unsigned int cmd,return ret; } -int dasd_ioctl (struct block_device *bdev,fmode_t mode, +int dasd_ioctl (struct block_device *bdev,blk_mode_t mode,unsigned int cmd,unsigned long arg) {struct dasd_block *block;
drivers/s390/block/dcssblk.c +2 -2
@@ -28,7 +28,7 @@#define DCSSBLK_PARM_LEN 400#define DCSS_BUS_ID_SIZE 20 -static int dcssblk_open (struct gendisk *disk,fmode_t mode); +static int dcssblk_open (struct gendisk *disk,blk_mode_t mode);static void dcssblk_release (struct gendisk *disk);static void dcssblk_submit_bio (struct bio *bio); static long dcssblk_dax_direct_access(struct dax_device *dax_dev, pgoff_t pgoff,
@@ -809,7 +809,7 @@ dcssblk_remove_store(struct device *dev, struct device_attribute *attr, const ch }static int -dcssblk_open (struct gendisk *disk,fmode_t mode) +dcssblk_open (struct gendisk *disk,blk_mode_t mode) {struct dcssblk_dev_info *dev_info = disk->private_data;int rc;
drivers/scsi/sd.c +10 -9
@@ -1298,7 +1298,7 @@ static bool sd_need_revalidate(struct gendisk *disk, struct scsi_disk *sdkp)/** * sd_open - open a scsi disk device * @disk: disk to open -* @mode: FMODE_* mask +* @mode: open mode * * Returns 0 if successful. Returns a negated errno value in case * of error.
@@ -1310,7 +1310,7 @@ static bool sd_need_revalidate(struct gendisk *disk, struct scsi_disk *sdkp)* * Locking: called with disk->open_mutex held. **/ -static int sd_open (struct gendisk *disk,fmode_t mode) +static int sd_open (struct gendisk *disk,blk_mode_t mode) {struct scsi_disk *sdkp =scsi_disk (disk);struct scsi_device *sdev = sdkp->device;
@@ -1336,7 +1336,8 @@ static int sd_open(struct gendisk *disk, fmode_t mode)* If the drive is empty, just let the open fail. */ retval = -ENOMEDIUM ; -if (sdev->removable && !sdkp->media_present && !(mode &FMODE_NDELAY )) +if (sdev->removable && !sdkp->media_present && + !(mode &BLK_OPEN_NDELAY )) goto error_out;/*
@@ -1344,7 +1345,7 @@ static int sd_open(struct gendisk *disk, fmode_t mode)* if the user expects to be able to write to the thing. */ retval = -EROFS ; -if (sdkp->write_prot && (mode &FMODE_WRITE )) +if (sdkp->write_prot && (mode &BLK_OPEN_WRITE )) goto error_out;/*
@@ -1379,7 +1380,7 @@ static int sd_open(struct gendisk *disk, fmode_t mode)* Note: may block (uninterruptible) if error recovery is underway * on this disk. * -* Locking: called with bdev->bd_disk->open_mutex held. +* Locking: called with disk->open_mutex held. **/ static void sd_release (struct gendisk *disk) {
@@ -1424,7 +1425,7 @@ static int sd_getgeo(struct block_device *bdev, struct hd_geometry *geo)/** * sd_ioctl - process an ioctl * @bdev: target block device -* @mode: FMODE_* mask +* @mode: open mode * @cmd: ioctl command number * @arg: this is third argument given to ioctl(2) system call. * Often contains a pointer.
@@ -1435,7 +1436,7 @@ static int sd_getgeo(struct block_device *bdev, struct hd_geometry *geo)* Note: most ioctls are forward onto the block subsystem or further * down in the scsi subsystem. **/ -static int sd_ioctl (struct block_device *bdev,fmode_t mode, +static int sd_ioctl (struct block_device *bdev,blk_mode_t mode,unsigned int cmd,unsigned long arg) {struct gendisk *disk = bdev->bd_disk;
@@ -1457,13 +1458,13 @@ static int sd_ioctl(struct block_device *bdev, fmode_t mode,* access to the device is prohibited. */ error =scsi_ioctl_block_when_processing_errors (sdp, cmd, - (mode &FMODE_NDELAY ) !=0 ); + (mode &BLK_OPEN_NDELAY ));if (error)return error;if (is_sed_ioctl (cmd))return sed_ioctl (sdkp->opal_dev, cmd, p); -return scsi_ioctl (sdp, mode &FMODE_WRITE , cmd, p); +return scsi_ioctl (sdp, mode &BLK_OPEN_WRITE , cmd, p); }static void set_media_not_present (struct scsi_disk *sdkp)
drivers/scsi/sr.c +5 -5
@@ -484,7 +484,7 @@ static void sr_revalidate_disk(struct scsi_cd *cd)get_sectorsize (cd); } -static int sr_block_open (struct gendisk *disk,fmode_t mode) +static int sr_block_open (struct gendisk *disk,blk_mode_t mode) {struct scsi_cd *cd =scsi_cd (disk);struct scsi_device *sdev = cd->device;
@@ -518,8 +518,8 @@ static void sr_block_release(struct gendisk *disk)scsi_device_put (cd->device); } -static int sr_block_ioctl (struct block_device *bdev,fmode_t mode,unsigned cmd, -unsigned long arg) +static int sr_block_ioctl (struct block_device *bdev,blk_mode_t mode, +unsigned cmd,unsigned long arg) {struct scsi_cd *cd =scsi_cd (bdev->bd_disk);struct scsi_device *sdev = cd->device;
@@ -532,7 +532,7 @@ static int sr_block_ioctl(struct block_device *bdev, fmode_t mode, unsigned cmd,mutex_lock (&cd->lock); ret =scsi_ioctl_block_when_processing_errors (sdev, cmd, - (mode &FMODE_NDELAY ) !=0 ); + (mode &BLK_OPEN_NDELAY ));if (ret) goto out;
@@ -543,7 +543,7 @@ static int sr_block_ioctl(struct block_device *bdev, fmode_t mode, unsigned cmd,if (ret != -ENOSYS ) goto put; } - ret =scsi_ioctl (sdev, mode &FMODE_WRITE , cmd, argp); + ret =scsi_ioctl (sdev, mode &BLK_OPEN_WRITE , cmd, argp); put:scsi_autopm_put_device (sdev);
drivers/target/target_core_iblock.c +2 -3
@@ -90,7 +90,7 @@ static int iblock_configure_device(struct se_device *dev)struct request_queue *q;struct block_device *bd =NULL ;struct blk_integrity *bi; -fmode_t mode; +blk_mode_t mode =BLK_OPEN_READ ;unsigned int max_write_zeroes_sectors;int ret;
@@ -108,9 +108,8 @@ static int iblock_configure_device(struct se_device *dev)pr_debug ("IBLOCK: Claiming struct block_device: %s\n" , ib_dev->ibd_udev_path); - mode =FMODE_READ ;if (!ib_dev->ibd_readonly) - mode |=FMODE_WRITE ; + mode |=BLK_OPEN_WRITE ;else dev->dev_flags |=DF_READ_ONLY ;
drivers/target/target_core_pscsi.c +2 -2
@@ -366,8 +366,8 @@ static int pscsi_create_type_disk(struct se_device *dev, struct scsi_device *sd)* Claim exclusive struct block_device access to struct scsi_device * for TYPE_DISK and TYPE_ZBC using supplied udev_path */ - bd =blkdev_get_by_path (dev->udev_path,FMODE_WRITE |FMODE_READ , pdv, -NULL ); + bd =blkdev_get_by_path (dev->udev_path,BLK_OPEN_WRITE |BLK_OPEN_READ , + pdv,NULL );if (IS_ERR (bd)) {pr_err ("pSCSI: blkdev_get_by_path() failed\n" );scsi_device_put (sd);
fs/btrfs/dev-replace.c +1 -1
@@ -257,7 +257,7 @@ static int btrfs_init_dev_replace_tgtdev(struct btrfs_fs_info *fs_info,return -EINVAL ; } - bdev =blkdev_get_by_path (device_path,FMODE_WRITE , + bdev =blkdev_get_by_path (device_path,BLK_OPEN_WRITE , fs_info->bdev_holder,NULL );if (IS_ERR (bdev)) {btrfs_err (fs_info,"target device %s is invalid!" , device_path);
fs/btrfs/super.c +2 -2
@@ -849,7 +849,7 @@ int btrfs_parse_options(struct btrfs_fs_info *info, char *options,* All other options will be parsed on much later in the mount process and * only when we need to allocate a new super block. */ -static int btrfs_parse_device_options (const char *options,fmode_t flags) +static int btrfs_parse_device_options (const char *options,blk_mode_t flags) {substring_t args[MAX_OPT_ARGS ];char *device_name, *opts, *orig, *p;
@@ -1440,7 +1440,7 @@ static struct dentry *btrfs_mount_root(struct file_system_type *fs_type,struct btrfs_fs_devices *fs_devices =NULL ;struct btrfs_fs_info *fs_info =NULL ;void *new_sec_opts =NULL ; -fmode_t mode =sb_open_mode (flags); +blk_mode_t mode =sb_open_mode (flags);int error =0 ;if (data) {
fs/btrfs/volumes.c +8 -8
@@ -490,7 +490,7 @@ static struct btrfs_fs_devices *find_fsid_with_metadata_uuid(static int -btrfs_get_bdev_and_sb (const char *device_path,fmode_t flags,void *holder, +btrfs_get_bdev_and_sb (const char *device_path,blk_mode_t flags,void *holder,int flush,struct block_device **bdev,struct btrfs_super_block **disk_super) {
@@ -590,7 +590,7 @@ static int btrfs_free_stale_devices(dev_t devt, struct btrfs_device *skip_device* fs_devices->device_list_mutex here. */ static int btrfs_open_one_device (struct btrfs_fs_devices *fs_devices, -struct btrfs_device *device,fmode_t flags, +struct btrfs_device *device,blk_mode_t flags,void *holder) {struct block_device *bdev;
@@ -1207,7 +1207,7 @@ void btrfs_close_devices(struct btrfs_fs_devices *fs_devices) }static int open_fs_devices (struct btrfs_fs_devices *fs_devices, -fmode_t flags,void *holder) +blk_mode_t flags,void *holder) {struct btrfs_device *device;struct btrfs_device *latest_dev =NULL ;
@@ -1255,7 +1255,7 @@ static int devid_cmp(void *priv, const struct list_head *a, }int btrfs_open_devices (struct btrfs_fs_devices *fs_devices, -fmode_t flags,void *holder) +blk_mode_t flags,void *holder) {int ret;
@@ -1346,7 +1346,7 @@ int btrfs_forget_devices(dev_t devt)* and we are not allowed to call set_blocksize during the scan. The superblock * is read via pagecache */ -struct btrfs_device *btrfs_scan_one_device (const char *path,fmode_t flags) +struct btrfs_device *btrfs_scan_one_device (const char *path,blk_mode_t flags) {struct btrfs_super_block *disk_super;bool new_device_added = false;
@@ -2378,7 +2378,7 @@ int btrfs_get_dev_args_from_path(struct btrfs_fs_info *fs_info,return -ENOMEM ; } - ret =btrfs_get_bdev_and_sb (path,FMODE_READ ,NULL ,0 , + ret =btrfs_get_bdev_and_sb (path,BLK_OPEN_READ ,NULL ,0 , &bdev, &disk_super);if (ret) {btrfs_put_dev_args_from_path (args);
@@ -2625,7 +2625,7 @@ int btrfs_init_new_device(struct btrfs_fs_info *fs_info, const char *device_pathif (sb_rdonly (sb) && !fs_devices->seeding)return -EROFS ; - bdev =blkdev_get_by_path (device_path,FMODE_WRITE , + bdev =blkdev_get_by_path (device_path,BLK_OPEN_WRITE , fs_info->bdev_holder,NULL );if (IS_ERR (bdev))return PTR_ERR (bdev);
@@ -6907,7 +6907,7 @@ static struct btrfs_fs_devices *open_seed_devices(struct btrfs_fs_info *fs_info,if (IS_ERR (fs_devices))return fs_devices; - ret =open_fs_devices (fs_devices,FMODE_READ , fs_info->bdev_holder); + ret =open_fs_devices (fs_devices,BLK_OPEN_READ , fs_info->bdev_holder);if (ret) {free_fs_devices (fs_devices);return ERR_PTR (ret);
fs/btrfs/volumes.h +2 -2
@@ -599,8 +599,8 @@ struct btrfs_block_group *btrfs_create_chunk(struct btrfs_trans_handle *trans, u64 type);void btrfs_mapping_tree_free (struct extent_map_tree *tree);int btrfs_open_devices (struct btrfs_fs_devices *fs_devices, -fmode_t flags,void *holder); -struct btrfs_device *btrfs_scan_one_device (const char *path,fmode_t flags); +blk_mode_t flags,void *holder); +struct btrfs_device *btrfs_scan_one_device (const char *path,blk_mode_t flags);int btrfs_forget_devices (dev_t devt);void btrfs_close_devices (struct btrfs_fs_devices *fs_devices);void btrfs_free_extra_devids (struct btrfs_fs_devices *fs_devices);
fs/erofs/super.c +1 -1
@@ -254,7 +254,7 @@ static int erofs_init_device(struct erofs_buf *buf, struct super_block *sb,return PTR_ERR (fscache); dif->fscache = fscache; }else if (!sbi->devs->flatdev) { - bdev =blkdev_get_by_path (dif->path,FMODE_READ , sb->s_type, + bdev =blkdev_get_by_path (dif->path,BLK_OPEN_READ , sb->s_type,NULL );if (IS_ERR (bdev))return PTR_ERR (bdev);
fs/ext4/super.c +1 -1
@@ -1112,7 +1112,7 @@ static struct block_device *ext4_blkdev_get(dev_t dev, struct super_block *sb) {struct block_device *bdev; - bdev =blkdev_get_by_dev (dev,FMODE_READ |FMODE_WRITE , sb, + bdev =blkdev_get_by_dev (dev,BLK_OPEN_READ |BLK_OPEN_WRITE , sb, &ext4_holder_ops);if (IS_ERR (bdev)) goto fail;
fs/jfs/jfs_logmgr.c +1 -1
@@ -1100,7 +1100,7 @@ int lmLogOpen(struct super_block *sb)* file systems to log may have n-to-1 relationship; */ - bdev =blkdev_get_by_dev (sbi->logdev,FMODE_READ |FMODE_WRITE , + bdev =blkdev_get_by_dev (sbi->logdev,BLK_OPEN_READ |BLK_OPEN_WRITE , log,NULL );if (IS_ERR (bdev)) { rc =PTR_ERR (bdev);
fs/nfs/blocklayout/dev.c +3 -2
@@ -243,7 +243,8 @@ bl_parse_simple(struct nfs_server *server, struct pnfs_block_dev *d,if (!dev)return -EIO ; - bdev =blkdev_get_by_dev (dev,FMODE_READ |FMODE_WRITE ,NULL ,NULL ); + bdev =blkdev_get_by_dev (dev,BLK_OPEN_READ |BLK_OPEN_WRITE ,NULL , +NULL );if (IS_ERR (bdev)) {printk (KERN_WARNING "pNFS: failed to open device %d:%d (%ld)\n" ,MAJOR (dev),MINOR (dev),PTR_ERR (bdev));
@@ -312,7 +313,7 @@ bl_open_path(struct pnfs_block_volume *v, const char *prefix)if (!devname)return ERR_PTR (-ENOMEM ); - bdev =blkdev_get_by_path (devname,FMODE_READ |FMODE_WRITE ,NULL , + bdev =blkdev_get_by_path (devname,BLK_OPEN_READ |BLK_OPEN_WRITE ,NULL ,NULL );if (IS_ERR (bdev)) { pr_warn("pNFS: failed to open device %s (%ld)\n",
fs/ocfs2/cluster/heartbeat.c +2 -1
@@ -1786,7 +1786,8 @@ static ssize_t o2hb_region_dev_store(struct config_item *item, goto out2; reg->hr_bdev =blkdev_get_by_dev (f.file->f_mapping->host->i_rdev, -FMODE_WRITE |FMODE_READ ,NULL ,NULL ); +BLK_OPEN_WRITE |BLK_OPEN_READ ,NULL , +NULL );if (IS_ERR (reg->hr_bdev)) { ret =PTR_ERR (reg->hr_bdev); reg->hr_bdev =NULL ;
fs/reiserfs/journal.c +2 -2
@@ -2598,7 +2598,7 @@ static int journal_init_dev(struct super_block *super,struct reiserfs_journal *journal, const char *jdev_name) { - fmode_t blkdev_mode = FMODE_READ; + blk_mode_t blkdev_mode = BLK_OPEN_READ;void *holder = journal;int result;dev_t jdev;
@@ -2610,7 +2610,7 @@ static int journal_init_dev(struct super_block *super, new_decode_dev(SB_ONDISK_JOURNAL_DEVICE(super)) : super->s_dev;if (!bdev_read_only (super->s_bdev)) - blkdev_mode |=FMODE_WRITE ; + blkdev_mode |=BLK_OPEN_WRITE ;/* there is no "jdev" option and journal is on separate device */ if ((!jdev_name || !jdev_name[0 ])) {
fs/xfs/xfs_super.c +1 -1
@@ -396,7 +396,7 @@ xfs_blkdev_get( {int error =0 ; - *bdevp =blkdev_get_by_path (name,FMODE_READ |FMODE_WRITE , mp, + *bdevp =blkdev_get_by_path (name,BLK_OPEN_READ |BLK_OPEN_WRITE , mp, &xfs_holder_ops);if (IS_ERR (*bdevp)) { error =PTR_ERR (*bdevp);
include/linux/blkdev.h +23 -7
@@ -112,6 +112,19 @@ struct blk_integrity {unsigned char tag_size; }; +typedef unsigned int __bitwise blk_mode_t ; + +/* open for reading */ +#define BLK_OPEN_READ ((__force blk_mode_t)(1 << 0)) +/* open for writing */ +#define BLK_OPEN_WRITE ((__force blk_mode_t)(1 << 1)) +/* open exclusively (vs other exclusive openers */ +#define BLK_OPEN_EXCL ((__force blk_mode_t)(1 << 2)) +/* opened with O_NDELAY */ +#define BLK_OPEN_NDELAY ((__force blk_mode_t)(1 << 3)) +/* open for "writes" only for ioctls (specialy hack for floppy.c) */ +#define BLK_OPEN_WRITE_IOCTL ((__force blk_mode_t)(1 << 4)) +struct gendisk {/* * major/first_minor/minors should not be set by any new driver, the
@@ -187,6 +200,7 @@ struct gendisk {struct badblocks *bb;struct lockdep_map lockdep_map;u64 diskseq; +blk_mode_t open_mode;/* * Independent sector access ranges. This is always NULL for
@@ -1363,10 +1377,12 @@ struct block_device_operations {void (*submit_bio)(struct bio *bio);int (*poll_bio)(struct bio *bio,struct io_comp_batch *iob,unsigned int flags); -int (*open)(struct gendisk *disk,fmode_t mode); +int (*open)(struct gendisk *disk,blk_mode_t mode);void (*release)(struct gendisk *disk); -int (*ioctl) (struct block_device *,fmode_t ,unsigned ,unsigned long ); -int (*compat_ioctl) (struct block_device *,fmode_t ,unsigned ,unsigned long ); +int (*ioctl)(struct block_device *bdev,blk_mode_t mode, +unsigned cmd,unsigned long arg); +int (*compat_ioctl)(struct block_device *bdev,blk_mode_t mode, +unsigned cmd,unsigned long arg);unsigned int (*check_events) (struct gendisk *disk,unsigned int clearing);void (*unlock_native_capacity) (struct gendisk *);
@@ -1393,7 +1409,7 @@ struct block_device_operations { };#ifdef CONFIG_COMPAT -extern int blkdev_compat_ptr_ioctl (struct block_device *,fmode_t , +extern int blkdev_compat_ptr_ioctl (struct block_device *,blk_mode_t ,unsigned int ,unsigned long );#else #define blkdev_compat_ptr_ioctl NULL
@@ -1455,11 +1471,11 @@ struct blk_holder_ops {* as stored in sb->s_flags. */ #define sb_open_mode (flags) \ - (FMODE_READ | (((flags) & SB_RDONLY) ? 0 : FMODE_WRITE)) + (BLK_OPEN_READ | (((flags) & SB_RDONLY) ? 0 : BLK_OPEN_WRITE)) -struct block_device *blkdev_get_by_dev (dev_t dev,fmode_t mode,void *holder, +struct block_device *blkdev_get_by_dev (dev_t dev,blk_mode_t mode,void *holder,const struct blk_holder_ops *hops); -struct block_device *blkdev_get_by_path (const char *path,fmode_t mode, +struct block_device *blkdev_get_by_path (const char *path,blk_mode_t mode,void *holder,const struct blk_holder_ops *hops);int bd_prepare_to_claim (struct block_device *bdev,void *holder,const struct blk_holder_ops *hops);
include/linux/cdrom.h +2 -1
@@ -13,6 +13,7 @@#include <linux/fs.h> /* not really needed, later.. */ #include <linux/list.h> +#include <linux/blkdev.h> #include <scsi/scsi_common.h> #include <uapi/linux/cdrom.h>
@@ -101,7 +102,7 @@ int cdrom_read_tocentry(struct cdrom_device_info *cdi, struct cdrom_tocentry *entry);/* the general block_device operations structure: */ -int cdrom_open (struct cdrom_device_info *cdi,fmode_t mode); +int cdrom_open (struct cdrom_device_info *cdi,blk_mode_t mode);void cdrom_release (struct cdrom_device_info *cdi);int cdrom_ioctl (struct cdrom_device_info *cdi,struct block_device *bdev,unsigned int cmd,unsigned long arg);
include/linux/device-mapper.h +4 -4
@@ -166,7 +166,7 @@ void dm_error(const char *message);struct dm_dev {struct block_device *bdev;struct dax_device *dax_dev; -fmode_t mode; +blk_mode_t mode;char name[16 ]; };
@@ -174,7 +174,7 @@ struct dm_dev {* Constructors should call these functions to ensure destination devices * are opened/closed correctly. */ -int dm_get_device (struct dm_target *ti,const char *path,fmode_t mode, +int dm_get_device (struct dm_target *ti,const char *path,blk_mode_t mode,struct dm_dev **result);void dm_put_device (struct dm_target *ti,struct dm_dev *d);
@@ -543,7 +543,7 @@ int dm_set_geometry(struct mapped_device *md, struct hd_geometry *geo);/* * First create an empty table. */ -int dm_table_create (struct dm_table **result,fmode_t mode, +int dm_table_create (struct dm_table **result,blk_mode_t mode,unsigned int num_targets,struct mapped_device *md);/*
@@ -586,7 +586,7 @@ void dm_sync_table(struct mapped_device *md);* Queries */ sector_t dm_table_get_size (struct dm_table *t); -fmode_t dm_table_get_mode (struct dm_table *t); +blk_mode_t dm_table_get_mode (struct dm_table *t);struct mapped_device *dm_table_get_md (struct dm_table *t);const char *dm_table_device_name (struct dm_table *t);
kernel/power/swap.c +3 -3
@@ -356,8 +356,8 @@ static int swsusp_swap_check(void)return res; root_swap = res; - hib_resume_bdev =blkdev_get_by_dev (swsusp_resume_device,FMODE_WRITE , -NULL ,NULL ); + hib_resume_bdev =blkdev_get_by_dev (swsusp_resume_device, +BLK_OPEN_WRITE ,NULL ,NULL );if (IS_ERR (hib_resume_bdev))return PTR_ERR (hib_resume_bdev);
@@ -1521,7 +1521,7 @@ int swsusp_check(bool snapshot_test)void *holder = snapshot_test ? &swsusp_holder :NULL ;int error; - hib_resume_bdev =blkdev_get_by_dev (swsusp_resume_device,FMODE_READ , + hib_resume_bdev =blkdev_get_by_dev (swsusp_resume_device,BLK_OPEN_READ , holder,NULL );if (!IS_ERR (hib_resume_bdev)) {set_blocksize (hib_resume_bdev,PAGE_SIZE );
mm/swapfile.c +1 -1
@@ -2770,7 +2770,7 @@ static int claim_swapfile(struct swap_info_struct *p, struct inode *inode)if (S_ISBLK (inode->i_mode)) { p->bdev =blkdev_get_by_dev (inode->i_rdev, -FMODE_READ |FMODE_WRITE , p,NULL ); +BLK_OPEN_READ |BLK_OPEN_WRITE , p,NULL );if (IS_ERR (p->bdev)) { error =PTR_ERR (p->bdev); p->bdev =NULL ;
Signature · 1 line
2.39.2
Christian Brauner
maintainerRe: [PATCH 28/31] block: replace fmode_t with a block-specific type for block open flags
Quoted 2 lines · Christoph Hellwig
The only overlap between the block open flags mapped into the
fmode_tand other uses offmode_tareFMODE_READandFMODE_WRITE. Define a new
and FMODE_EXCL afaict
Quoted 184 lines
blk_mode_tinstead for use in blkdev_get_by_*, ->open and ->ioctl and stop abusingfmode_t.Signed-off-by Christoph Hellwig <[email protected]>--- arch/um/drivers/ubd_kern.c | 8 +++--- arch/xtensa/platforms/iss/simdisk.c | 2 +- block/bdev.c | 32 +++++++++++----------- block/blk-zoned.c | 8 +++--- block/blk.h | 11 ++++---- block/fops.c | 26 +++++++++++++----- block/genhd.c | 8 +++--- block/ioctl.c | 42 +++++++++-------------------- drivers/block/amiflop.c | 12 ++++----- drivers/block/aoe/aoeblk.c | 4 +-- drivers/block/ataflop.c | 25 +++++++++-------- drivers/block/drbd/drbd_main.c | 7 ++--- drivers/block/drbd/drbd_nl.c | 2 +- drivers/block/floppy.c | 28 +++++++++---------- drivers/block/loop.c | 22 +++++++-------- drivers/block/mtip32xx/mtip32xx.c | 4 +-- drivers/block/nbd.c | 4 +-- drivers/block/pktcdvd.c | 17 ++++++------ drivers/block/rbd.c | 2 +- drivers/block/rnbd/rnbd-clt.c | 4 +-- drivers/block/rnbd/rnbd-srv.c | 4 +-- drivers/block/sunvdc.c | 2 +- drivers/block/swim.c | 16 +++++------ drivers/block/swim3.c | 24 ++++++++--------- drivers/block/ublk_drv.c | 2 +- drivers/block/xen-blkback/xenbus.c | 2 +- drivers/block/xen-blkfront.c | 2 +- drivers/block/z2ram.c | 2 +- drivers/block/zram/zram_drv.c | 6 ++--- drivers/cdrom/cdrom.c | 4 +-- drivers/cdrom/gdrom.c | 4 +-- drivers/md/bcache/bcache.h | 2 +- drivers/md/bcache/request.c | 4 +-- drivers/md/bcache/super.c | 6 ++--- drivers/md/dm-cache-target.c | 12 ++++----- drivers/md/dm-clone-target.c | 10 +++---- drivers/md/dm-core.h | 7 +++-- drivers/md/dm-era-target.c | 6 +++-- drivers/md/dm-ioctl.c | 10 +++---- drivers/md/dm-snap.c | 4 +-- drivers/md/dm-table.c | 11 ++++---- drivers/md/dm-thin.c | 9 ++++--- drivers/md/dm-verity-fec.c | 2 +- drivers/md/dm-verity-target.c | 6 ++--- drivers/md/dm.c | 10 +++---- drivers/md/dm.h | 2 +- drivers/md/md.c | 8 +++--- drivers/mmc/core/block.c | 8 +++--- drivers/mtd/devices/block2mtd.c | 4 +-- drivers/mtd/mtd_blkdevs.c | 4 +-- drivers/mtd/ubi/block.c | 5 ++-- drivers/nvme/host/core.c | 2 +- drivers/nvme/host/ioctl.c | 8 +++--- drivers/nvme/host/multipath.c | 2 +- drivers/nvme/host/nvme.h | 4 +-- drivers/nvme/target/io-cmd-bdev.c | 2 +- drivers/s390/block/dasd.c | 6 ++--- drivers/s390/block/dasd_genhd.c | 3 ++- drivers/s390/block/dasd_int.h | 3 ++- drivers/s390/block/dasd_ioctl.c | 2 +- drivers/s390/block/dcssblk.c | 4 +-- drivers/scsi/sd.c | 19 ++++++------- drivers/scsi/sr.c | 10 +++---- drivers/target/target_core_iblock.c | 5 ++-- drivers/target/target_core_pscsi.c | 4 +-- fs/btrfs/dev-replace.c | 2 +- fs/btrfs/super.c | 4 +-- fs/btrfs/volumes.c | 16 +++++------ fs/btrfs/volumes.h | 4 +-- fs/erofs/super.c | 2 +- fs/ext4/super.c | 2 +- fs/jfs/jfs_logmgr.c | 2 +- fs/nfs/blocklayout/dev.c | 5 ++-- fs/ocfs2/cluster/heartbeat.c | 3 ++- fs/reiserfs/journal.c | 4 +-- fs/xfs/xfs_super.c | 2 +- include/linux/blkdev.h | 30 ++++++++++++++++----- include/linux/cdrom.h | 3 ++- include/linux/device-mapper.h | 8 +++--- kernel/power/swap.c | 6 ++--- mm/swapfile.c | 2 +- 81 files changed, 324 insertions(+), 311 deletions(-)arch/um/drivers/ubd_kern.c +4
-4@@ -108,9 +108,9 @@ static inline void ubd_set_bit(__u64 bit, unsigned char *data)static DEFINE_MUTEX (ubd_lock);static DEFINE_MUTEX (ubd_mutex);/* replaces BKL, might not be needed */ -static int ubd_open (struct gendisk *disk,fmode_t mode); +static int ubd_open (struct gendisk *disk,blk_mode_t mode);static void ubd_release (struct gendisk *disk); -static int ubd_ioctl (struct block_device *bdev,fmode_t mode, +static int ubd_ioctl (struct block_device *bdev,blk_mode_t mode,unsigned int cmd,unsigned long arg);static int ubd_getgeo (struct block_device *bdev,struct hd_geometry *geo);@@ -1154,7 +1154,7 @@ static int __init ubd_driver_init(void){device_initcall (ubd_driver_init); -static int ubd_open (struct gendisk *disk,fmode_t mode) +static int ubd_open (struct gendisk *disk,blk_mode_t mode) {struct ubd *ubd_dev = disk->private_data;int err =0 ;@@ -1389,7 +1389,7 @@ static int ubd_getgeo(struct block_device *bdev, struct hd_geometry *geo)return 0 ; } -static int ubd_ioctl (struct block_device *bdev,fmode_t mode, +static int ubd_ioctl (struct block_device *bdev,blk_mode_t mode,unsigned int cmd,unsigned long arg) {struct ubd *ubd_dev = bdev->bd_disk->private_data;arch/xtensa/platforms/iss/simdisk.c +1
-1@@ -120,7 +120,7 @@ static void simdisk_submit_bio(struct bio *bio)bio_endio (bio); } -static int simdisk_open (struct gendisk *disk,fmode_t mode) +static int simdisk_open (struct gendisk *disk,blk_mode_t mode) {struct simdisk *dev = disk->private_data;block/bdev.c +5
-5@@ -93,7 +93,7 @@ EXPORT_SYMBOL(invalidate_bdev);* Drop all buffers & page cache for given bdev range. This function bails * with error if bdev has other exclusive owner (such as filesystem). */ -int truncate_bdev_range (struct block_device *bdev,fmode_t mode, +int truncate_bdev_range (struct block_device *bdev,blk_mode_t mode,loff_t lstart,loff_t lend) {/* @@ -101,14 +101,14 @@ int truncate_bdev_range(struct block_device *bdev, fmode_t mode,* while we discard the buffer cache to avoid discarding buffers * under live filesystem. */ -if (!(mode &FMODE_EXCL )) { +if (!(mode &BLK_OPEN_EXCL )) {int err =bd_prepare_to_claim (bdev, truncate_bdev_range,NULL );if (err) goto invalidate; }truncate_inode_pages_range (bdev->bd_inode->i_mapping, lstart, lend); -if (!(mode &FMODE_EXCL )) +if (!(mode &BLK_OPEN_EXCL ))bd_abort_claiming (bdev, truncate_bdev_range);return 0 ;@@ -647,7 +647,7 @@ static void blkdev_flush_mapping(struct block_device *bdev)bdev_write_inode (bdev); } -static int blkdev_get_whole (struct block_device *bdev,fmode_t mode) +static int blkdev_get_whole (struct block_device *bdev,blk_mode_t mode) {struct gendisk *disk = bdev->bd_disk;int ret;@@ -679,7 +679,7 @@ static void blkdev_put_whole(struct block_device *bdev) bdev->bd_disk->fops->release (bdev->bd_disk); } -static int blkdev_get_part (struct block_device *part,fmode_t mode) +static int blkdev_get_part (struct block_device *part,blk_mode_t mode) {struct gendisk *disk = part->bd_disk;int ret;
block/bdev.c void blkdev_put_no_open(struct block_device *bdev) · line 746
Quoted 5 lines
block/bdev.c +1
-1@@ -743,11 +743,11 @@ void blkdev_put_no_open(struct block_device *bdev) {put_device (&bdev->bd_device); } - +
nit: This is whitespace damage, I think. There's a trailing tab.
Quoted 164 lines
block/bdev.c +10
-10/** * blkdev_get_by_dev - open a block device by device number * @dev: device number of block device to open -* @mode: FMODE_* mask +* @mode: open mode (BLK_OPEN_*) * @holder: exclusive holder identifier * @hops: holder operations * @@ -765,7 +765,7 @@ void blkdev_put_no_open(struct block_device *bdev)* RETURNS: * Reference to the block_device on success, ERR_PTR(-errno) on failure. */ -struct block_device *blkdev_get_by_dev (dev_t dev,fmode_t mode,void *holder, +struct block_device *blkdev_get_by_dev (dev_t dev,blk_mode_t mode,void *holder,const struct blk_holder_ops *hops) {bool unblock_events = true;@@ -775,8 +775,8 @@ struct block_device *blkdev_get_by_dev(dev_t dev, fmode_t mode, void *holder, ret =devcgroup_check_permission (DEVCG_DEV_BLOCK ,MAJOR (dev),MINOR (dev), - ((mode &FMODE_READ ) ?DEVCG_ACC_READ :0 ) | - ((mode &FMODE_WRITE ) ?DEVCG_ACC_WRITE :0 )); + ((mode &BLK_OPEN_READ ) ?DEVCG_ACC_READ :0 ) | + ((mode &BLK_OPEN_WRITE ) ?DEVCG_ACC_WRITE :0 ));if (ret)return ERR_PTR (ret);@@ -786,12 +786,12 @@ struct block_device *blkdev_get_by_dev(dev_t dev, fmode_t mode, void *holder, disk = bdev->bd_disk;if (holder) { - mode |=FMODE_EXCL ; + mode |=BLK_OPEN_EXCL ; ret =bd_prepare_to_claim (bdev, holder, hops);if (ret) goto put_blkdev; }else { -if (WARN_ON_ONCE (mode &FMODE_EXCL )) { +if (WARN_ON_ONCE (mode &BLK_OPEN_EXCL )) { ret = -EIO ; goto put_blkdev; }@@ -821,7 +821,7 @@ struct block_device *blkdev_get_by_dev(dev_t dev, fmode_t mode, void *holder,* writeable reference is too fragile given the way @mode is * used in blkdev_get/put(). */ -if ((mode &FMODE_WRITE ) && !bdev->bd_write_holder && +if ((mode &BLK_OPEN_WRITE ) && !bdev->bd_write_holder && (disk->event_flags &DISK_EVENT_FLAG_BLOCK_ON_EXCL_WRITE )) { bdev->bd_write_holder = true; unblock_events = false;@@ -848,7 +848,7 @@ EXPORT_SYMBOL(blkdev_get_by_dev);/** * blkdev_get_by_path - open a block device by name * @path: path to the block device to open -* @mode: FMODE_* mask +* @mode: open mode (BLK_OPEN_*) * @holder: exclusive holder identifier * * Open the block device described by the device file at @path. If @holder is @@ -861,7 +861,7 @@ EXPORT_SYMBOL(blkdev_get_by_dev);* RETURNS: * Reference to the block_device on success, ERR_PTR(-errno) on failure. */ -struct block_device *blkdev_get_by_path (const char *path,fmode_t mode, +struct block_device *blkdev_get_by_path (const char *path,blk_mode_t mode,void *holder,const struct blk_holder_ops *hops) {struct block_device *bdev;@@ -873,7 +873,7 @@ struct block_device *blkdev_get_by_path(const char *path, fmode_t mode,return ERR_PTR (error); bdev =blkdev_get_by_dev (dev, mode, holder, hops); -if (!IS_ERR (bdev) && (mode &FMODE_WRITE ) &&bdev_read_only (bdev)) { +if (!IS_ERR (bdev) && (mode &BLK_OPEN_WRITE ) &&bdev_read_only (bdev)) {blkdev_put (bdev, holder);return ERR_PTR (-EACCES ); }block/blk-zoned.c +4
-4@@ -356,8 +356,8 @@ int blkdev_report_zones_ioctl(struct block_device *bdev, unsigned int cmd,return 0 ; } -static int blkdev_truncate_zone_range (struct block_device *bdev,fmode_t mode, -const struct blk_zone_range *zrange) +static int blkdev_truncate_zone_range (struct block_device *bdev, +blk_mode_t mode,const struct blk_zone_range *zrange) {loff_t start, end;@@ -376,7 +376,7 @@ static int blkdev_truncate_zone_range(struct block_device *bdev, fmode_t mode,* BLKRESETZONE, BLKOPENZONE, BLKCLOSEZONE and BLKFINISHZONE ioctl processing. * Called from blkdev_ioctl. */ -int blkdev_zone_mgmt_ioctl (struct block_device *bdev,fmode_t mode, +int blkdev_zone_mgmt_ioctl (struct block_device *bdev,blk_mode_t mode,unsigned int cmd,unsigned long arg) {void __user *argp = (void __user *)arg;@@ -390,7 +390,7 @@ int blkdev_zone_mgmt_ioctl(struct block_device *bdev, fmode_t mode,if (!bdev_is_zoned (bdev))return -ENOTTY ; -if (!(mode &FMODE_WRITE )) +if (!(mode &BLK_OPEN_WRITE ))return -EBADF ;if (copy_from_user (&zrange, argp,sizeof (struct blk_zone_range )))block/blk.h +6
-5@@ -396,7 +396,7 @@ void disk_free_zone_bitmaps(struct gendisk *disk);void disk_clear_zone_settings (struct gendisk *disk);int blkdev_report_zones_ioctl (struct block_device *bdev,unsigned int cmd,unsigned long arg); -int blkdev_zone_mgmt_ioctl (struct block_device *bdev,fmode_t mode, +int blkdev_zone_mgmt_ioctl (struct block_device *bdev,blk_mode_t mode,unsigned int cmd,unsigned long arg);#else /* CONFIG_BLK_DEV_ZONED */ static inline void disk_free_zone_bitmaps (struct gendisk *disk) {}@@ -407,7 +407,7 @@ static inline int blkdev_report_zones_ioctl(struct block_device *bdev,return -ENOTTY ; }static inline int blkdev_zone_mgmt_ioctl (struct block_device *bdev, -fmode_t mode,unsigned int cmd,unsigned long arg) +blk_mode_t mode,unsigned int cmd,unsigned long arg) {return -ENOTTY ; }@@ -451,7 +451,7 @@ static inline void bio_release_page(struct bio *bio, struct page *page)struct request_queue *blk_alloc_queue (int node_id); -int disk_scan_partitions (struct gendisk *disk,fmode_t mode); +int disk_scan_partitions (struct gendisk *disk,blk_mode_t mode);int disk_alloc_events (struct gendisk *disk);void disk_add_events (struct gendisk *disk);@@ -466,8 +466,9 @@ extern struct device_attribute dev_attr_events_poll_msecs;extern struct attribute_group blk_trace_attr_group; -int truncate_bdev_range (struct block_device *bdev,fmode_t mode,loff_t lstart, -loff_t lend); +blk_mode_t file_to_blk_mode (struct file *file); +int truncate_bdev_range (struct block_device *bdev,blk_mode_t mode, +loff_t lstart,loff_t lend);long blkdev_ioctl (struct file *file,unsigned cmd,unsigned long arg);long compat_blkdev_ioctl (struct file *file,unsigned cmd,unsigned long arg);block/fops.c +1
-0@@ -470,6 +470,24 @@ static int blkdev_fsync(struct file *filp, loff_t start, loff_t end,return error; } +blk_mode_t file_to_blk_mode (struct file *file)
block/fops.c static int blkdev_fsync(struct file *filp, loff_t start, loff_t end, · line 483
Quoted 10 lines
block/fops.c +10
-0+{ +blk_mode_t mode =0 ; + +if (file->f_mode &FMODE_READ ) + mode |=BLK_OPEN_READ ; +if (file->f_mode &FMODE_WRITE ) + mode |=BLK_OPEN_WRITE ; +if (file->f_mode &FMODE_EXCL ) + mode |=BLK_OPEN_EXCL ; +if ((file->f_flags &O_ACCMODE ) ==3 )
I really don't like magic numbers like this.
Groan, O_RDONLY being defined as 0 strikes again... Becuase of this quirk we internally map
O_RDONLY(0) -> FMODE_READ(1)O_WRONLY(1) -> FMODE_WRITE(2)O_RDWR(3) -> (FMODE_READ | FMODE_WRITE)
so checking for the raw 3 here is confusing in addition to being a magic number as it could give the impression that what's checked here is (O_WRONLY | O_RDWR) which doesn't make sense...
So my perference would be in descending order of preference:
(file->f_flags & O_ACCMODE) == (FMODE_READ | FMODE_WRITE)
or while a little less clear but informative enough for people familiar with the O_RDONLY quirk:
if ((file->f_flags & O_ACCMODE) == O_ACCMODE)
Christian Brauner
maintainerRe: [PATCH 28/31] block: replace fmode_t with a block-specific type for block open flags
Quoted 375 lines · Christian Brauner
Quoted 2 lines · Christoph Hellwig
The only overlap between the block open flags mapped into the
fmode_tand other uses offmode_tareFMODE_READandFMODE_WRITE. Define a newand
FMODE_EXCLafaictQuoted 184 lines
blk_mode_tinstead for use in blkdev_get_by_*, ->open and ->ioctl and stop abusingfmode_t.Signed-off-by Christoph Hellwig <[email protected]>--- arch/um/drivers/ubd_kern.c | 8 +++--- arch/xtensa/platforms/iss/simdisk.c | 2 +- block/bdev.c | 32 +++++++++++----------- block/blk-zoned.c | 8 +++--- block/blk.h | 11 ++++---- block/fops.c | 26 +++++++++++++----- block/genhd.c | 8 +++--- block/ioctl.c | 42 +++++++++-------------------- drivers/block/amiflop.c | 12 ++++----- drivers/block/aoe/aoeblk.c | 4 +-- drivers/block/ataflop.c | 25 +++++++++-------- drivers/block/drbd/drbd_main.c | 7 ++--- drivers/block/drbd/drbd_nl.c | 2 +- drivers/block/floppy.c | 28 +++++++++---------- drivers/block/loop.c | 22 +++++++-------- drivers/block/mtip32xx/mtip32xx.c | 4 +-- drivers/block/nbd.c | 4 +-- drivers/block/pktcdvd.c | 17 ++++++------ drivers/block/rbd.c | 2 +- drivers/block/rnbd/rnbd-clt.c | 4 +-- drivers/block/rnbd/rnbd-srv.c | 4 +-- drivers/block/sunvdc.c | 2 +- drivers/block/swim.c | 16 +++++------ drivers/block/swim3.c | 24 ++++++++--------- drivers/block/ublk_drv.c | 2 +- drivers/block/xen-blkback/xenbus.c | 2 +- drivers/block/xen-blkfront.c | 2 +- drivers/block/z2ram.c | 2 +- drivers/block/zram/zram_drv.c | 6 ++--- drivers/cdrom/cdrom.c | 4 +-- drivers/cdrom/gdrom.c | 4 +-- drivers/md/bcache/bcache.h | 2 +- drivers/md/bcache/request.c | 4 +-- drivers/md/bcache/super.c | 6 ++--- drivers/md/dm-cache-target.c | 12 ++++----- drivers/md/dm-clone-target.c | 10 +++---- drivers/md/dm-core.h | 7 +++-- drivers/md/dm-era-target.c | 6 +++-- drivers/md/dm-ioctl.c | 10 +++---- drivers/md/dm-snap.c | 4 +-- drivers/md/dm-table.c | 11 ++++---- drivers/md/dm-thin.c | 9 ++++--- drivers/md/dm-verity-fec.c | 2 +- drivers/md/dm-verity-target.c | 6 ++--- drivers/md/dm.c | 10 +++---- drivers/md/dm.h | 2 +- drivers/md/md.c | 8 +++--- drivers/mmc/core/block.c | 8 +++--- drivers/mtd/devices/block2mtd.c | 4 +-- drivers/mtd/mtd_blkdevs.c | 4 +-- drivers/mtd/ubi/block.c | 5 ++-- drivers/nvme/host/core.c | 2 +- drivers/nvme/host/ioctl.c | 8 +++--- drivers/nvme/host/multipath.c | 2 +- drivers/nvme/host/nvme.h | 4 +-- drivers/nvme/target/io-cmd-bdev.c | 2 +- drivers/s390/block/dasd.c | 6 ++--- drivers/s390/block/dasd_genhd.c | 3 ++- drivers/s390/block/dasd_int.h | 3 ++- drivers/s390/block/dasd_ioctl.c | 2 +- drivers/s390/block/dcssblk.c | 4 +-- drivers/scsi/sd.c | 19 ++++++------- drivers/scsi/sr.c | 10 +++---- drivers/target/target_core_iblock.c | 5 ++-- drivers/target/target_core_pscsi.c | 4 +-- fs/btrfs/dev-replace.c | 2 +- fs/btrfs/super.c | 4 +-- fs/btrfs/volumes.c | 16 +++++------ fs/btrfs/volumes.h | 4 +-- fs/erofs/super.c | 2 +- fs/ext4/super.c | 2 +- fs/jfs/jfs_logmgr.c | 2 +- fs/nfs/blocklayout/dev.c | 5 ++-- fs/ocfs2/cluster/heartbeat.c | 3 ++- fs/reiserfs/journal.c | 4 +-- fs/xfs/xfs_super.c | 2 +- include/linux/blkdev.h | 30 ++++++++++++++++----- include/linux/cdrom.h | 3 ++- include/linux/device-mapper.h | 8 +++--- kernel/power/swap.c | 6 ++--- mm/swapfile.c | 2 +- 81 files changed, 324 insertions(+), 311 deletions(-)arch/um/drivers/ubd_kern.c +4
-4@@ -108,9 +108,9 @@ static inline void ubd_set_bit(__u64 bit, unsigned char *data)static DEFINE_MUTEX (ubd_lock);static DEFINE_MUTEX (ubd_mutex);/* replaces BKL, might not be needed */ -static int ubd_open (struct gendisk *disk,fmode_t mode); +static int ubd_open (struct gendisk *disk,blk_mode_t mode);static void ubd_release (struct gendisk *disk); -static int ubd_ioctl (struct block_device *bdev,fmode_t mode, +static int ubd_ioctl (struct block_device *bdev,blk_mode_t mode,unsigned int cmd,unsigned long arg);static int ubd_getgeo (struct block_device *bdev,struct hd_geometry *geo);@@ -1154,7 +1154,7 @@ static int __init ubd_driver_init(void){device_initcall (ubd_driver_init); -static int ubd_open (struct gendisk *disk,fmode_t mode) +static int ubd_open (struct gendisk *disk,blk_mode_t mode) {struct ubd *ubd_dev = disk->private_data;int err =0 ;@@ -1389,7 +1389,7 @@ static int ubd_getgeo(struct block_device *bdev, struct hd_geometry *geo)return 0 ; } -static int ubd_ioctl (struct block_device *bdev,fmode_t mode, +static int ubd_ioctl (struct block_device *bdev,blk_mode_t mode,unsigned int cmd,unsigned long arg) {struct ubd *ubd_dev = bdev->bd_disk->private_data;arch/xtensa/platforms/iss/simdisk.c +1
-1@@ -120,7 +120,7 @@ static void simdisk_submit_bio(struct bio *bio)bio_endio (bio); } -static int simdisk_open (struct gendisk *disk,fmode_t mode) +static int simdisk_open (struct gendisk *disk,blk_mode_t mode) {struct simdisk *dev = disk->private_data;block/bdev.c +5
-5@@ -93,7 +93,7 @@ EXPORT_SYMBOL(invalidate_bdev);* Drop all buffers & page cache for given bdev range. This function bails * with error if bdev has other exclusive owner (such as filesystem). */ -int truncate_bdev_range (struct block_device *bdev,fmode_t mode, +int truncate_bdev_range (struct block_device *bdev,blk_mode_t mode,loff_t lstart,loff_t lend) {/* @@ -101,14 +101,14 @@ int truncate_bdev_range(struct block_device *bdev, fmode_t mode,* while we discard the buffer cache to avoid discarding buffers * under live filesystem. */ -if (!(mode &FMODE_EXCL )) { +if (!(mode &BLK_OPEN_EXCL )) {int err =bd_prepare_to_claim (bdev, truncate_bdev_range,NULL );if (err) goto invalidate; }truncate_inode_pages_range (bdev->bd_inode->i_mapping, lstart, lend); -if (!(mode &FMODE_EXCL )) +if (!(mode &BLK_OPEN_EXCL ))bd_abort_claiming (bdev, truncate_bdev_range);return 0 ;@@ -647,7 +647,7 @@ static void blkdev_flush_mapping(struct block_device *bdev)bdev_write_inode (bdev); } -static int blkdev_get_whole (struct block_device *bdev,fmode_t mode) +static int blkdev_get_whole (struct block_device *bdev,blk_mode_t mode) {struct gendisk *disk = bdev->bd_disk;int ret;@@ -679,7 +679,7 @@ static void blkdev_put_whole(struct block_device *bdev) bdev->bd_disk->fops->release (bdev->bd_disk); } -static int blkdev_get_part (struct block_device *part,fmode_t mode) +static int blkdev_get_part (struct block_device *part,blk_mode_t mode) {struct gendisk *disk = part->bd_disk;int ret;block/bdev.c void blkdev_put_no_open(struct block_device *bdev) · line 746
Quoted 5 lines
block/bdev.c +1
-1@@ -743,11 +743,11 @@ void blkdev_put_no_open(struct block_device *bdev) {put_device (&bdev->bd_device); } - +nit: This is whitespace damage, I think. There's a trailing tab.
Quoted 164 lines
block/bdev.c +10
-10/** * blkdev_get_by_dev - open a block device by device number * @dev: device number of block device to open -* @mode: FMODE_* mask +* @mode: open mode (BLK_OPEN_*) * @holder: exclusive holder identifier * @hops: holder operations * @@ -765,7 +765,7 @@ void blkdev_put_no_open(struct block_device *bdev)* RETURNS: * Reference to the block_device on success, ERR_PTR(-errno) on failure. */ -struct block_device *blkdev_get_by_dev (dev_t dev,fmode_t mode,void *holder, +struct block_device *blkdev_get_by_dev (dev_t dev,blk_mode_t mode,void *holder,const struct blk_holder_ops *hops) {bool unblock_events = true;@@ -775,8 +775,8 @@ struct block_device *blkdev_get_by_dev(dev_t dev, fmode_t mode, void *holder, ret =devcgroup_check_permission (DEVCG_DEV_BLOCK ,MAJOR (dev),MINOR (dev), - ((mode &FMODE_READ ) ?DEVCG_ACC_READ :0 ) | - ((mode &FMODE_WRITE ) ?DEVCG_ACC_WRITE :0 )); + ((mode &BLK_OPEN_READ ) ?DEVCG_ACC_READ :0 ) | + ((mode &BLK_OPEN_WRITE ) ?DEVCG_ACC_WRITE :0 ));if (ret)return ERR_PTR (ret);@@ -786,12 +786,12 @@ struct block_device *blkdev_get_by_dev(dev_t dev, fmode_t mode, void *holder, disk = bdev->bd_disk;if (holder) { - mode |=FMODE_EXCL ; + mode |=BLK_OPEN_EXCL ; ret =bd_prepare_to_claim (bdev, holder, hops);if (ret) goto put_blkdev; }else { -if (WARN_ON_ONCE (mode &FMODE_EXCL )) { +if (WARN_ON_ONCE (mode &BLK_OPEN_EXCL )) { ret = -EIO ; goto put_blkdev; }@@ -821,7 +821,7 @@ struct block_device *blkdev_get_by_dev(dev_t dev, fmode_t mode, void *holder,* writeable reference is too fragile given the way @mode is * used in blkdev_get/put(). */ -if ((mode &FMODE_WRITE ) && !bdev->bd_write_holder && +if ((mode &BLK_OPEN_WRITE ) && !bdev->bd_write_holder && (disk->event_flags &DISK_EVENT_FLAG_BLOCK_ON_EXCL_WRITE )) { bdev->bd_write_holder = true; unblock_events = false;@@ -848,7 +848,7 @@ EXPORT_SYMBOL(blkdev_get_by_dev);/** * blkdev_get_by_path - open a block device by name * @path: path to the block device to open -* @mode: FMODE_* mask +* @mode: open mode (BLK_OPEN_*) * @holder: exclusive holder identifier * * Open the block device described by the device file at @path. If @holder is @@ -861,7 +861,7 @@ EXPORT_SYMBOL(blkdev_get_by_dev);* RETURNS: * Reference to the block_device on success, ERR_PTR(-errno) on failure. */ -struct block_device *blkdev_get_by_path (const char *path,fmode_t mode, +struct block_device *blkdev_get_by_path (const char *path,blk_mode_t mode,void *holder,const struct blk_holder_ops *hops) {struct block_device *bdev;@@ -873,7 +873,7 @@ struct block_device *blkdev_get_by_path(const char *path, fmode_t mode,return ERR_PTR (error); bdev =blkdev_get_by_dev (dev, mode, holder, hops); -if (!IS_ERR (bdev) && (mode &FMODE_WRITE ) &&bdev_read_only (bdev)) { +if (!IS_ERR (bdev) && (mode &BLK_OPEN_WRITE ) &&bdev_read_only (bdev)) {blkdev_put (bdev, holder);return ERR_PTR (-EACCES ); }block/blk-zoned.c +4
-4@@ -356,8 +356,8 @@ int blkdev_report_zones_ioctl(struct block_device *bdev, unsigned int cmd,return 0 ; } -static int blkdev_truncate_zone_range (struct block_device *bdev,fmode_t mode, -const struct blk_zone_range *zrange) +static int blkdev_truncate_zone_range (struct block_device *bdev, +blk_mode_t mode,const struct blk_zone_range *zrange) {loff_t start, end;@@ -376,7 +376,7 @@ static int blkdev_truncate_zone_range(struct block_device *bdev, fmode_t mode,* BLKRESETZONE, BLKOPENZONE, BLKCLOSEZONE and BLKFINISHZONE ioctl processing. * Called from blkdev_ioctl. */ -int blkdev_zone_mgmt_ioctl (struct block_device *bdev,fmode_t mode, +int blkdev_zone_mgmt_ioctl (struct block_device *bdev,blk_mode_t mode,unsigned int cmd,unsigned long arg) {void __user *argp = (void __user *)arg;@@ -390,7 +390,7 @@ int blkdev_zone_mgmt_ioctl(struct block_device *bdev, fmode_t mode,if (!bdev_is_zoned (bdev))return -ENOTTY ; -if (!(mode &FMODE_WRITE )) +if (!(mode &BLK_OPEN_WRITE ))return -EBADF ;if (copy_from_user (&zrange, argp,sizeof (struct blk_zone_range )))block/blk.h +6
-5@@ -396,7 +396,7 @@ void disk_free_zone_bitmaps(struct gendisk *disk);void disk_clear_zone_settings (struct gendisk *disk);int blkdev_report_zones_ioctl (struct block_device *bdev,unsigned int cmd,unsigned long arg); -int blkdev_zone_mgmt_ioctl (struct block_device *bdev,fmode_t mode, +int blkdev_zone_mgmt_ioctl (struct block_device *bdev,blk_mode_t mode,unsigned int cmd,unsigned long arg);#else /* CONFIG_BLK_DEV_ZONED */ static inline void disk_free_zone_bitmaps (struct gendisk *disk) {}@@ -407,7 +407,7 @@ static inline int blkdev_report_zones_ioctl(struct block_device *bdev,return -ENOTTY ; }static inline int blkdev_zone_mgmt_ioctl (struct block_device *bdev, -fmode_t mode,unsigned int cmd,unsigned long arg) +blk_mode_t mode,unsigned int cmd,unsigned long arg) {return -ENOTTY ; }@@ -451,7 +451,7 @@ static inline void bio_release_page(struct bio *bio, struct page *page)struct request_queue *blk_alloc_queue (int node_id); -int disk_scan_partitions (struct gendisk *disk,fmode_t mode); +int disk_scan_partitions (struct gendisk *disk,blk_mode_t mode);int disk_alloc_events (struct gendisk *disk);void disk_add_events (struct gendisk *disk);@@ -466,8 +466,9 @@ extern struct device_attribute dev_attr_events_poll_msecs;extern struct attribute_group blk_trace_attr_group; -int truncate_bdev_range (struct block_device *bdev,fmode_t mode,loff_t lstart, -loff_t lend); +blk_mode_t file_to_blk_mode (struct file *file); +int truncate_bdev_range (struct block_device *bdev,blk_mode_t mode, +loff_t lstart,loff_t lend);long blkdev_ioctl (struct file *file,unsigned cmd,unsigned long arg);long compat_blkdev_ioctl (struct file *file,unsigned cmd,unsigned long arg);block/fops.c +1
-0@@ -470,6 +470,24 @@ static int blkdev_fsync(struct file *filp, loff_t start, loff_t end,return error; } +blk_mode_t file_to_blk_mode (struct file *file)block/fops.c static int blkdev_fsync(struct file *filp, loff_t start, loff_t end, · line 483
Quoted 10 lines
block/fops.c +10
-0+{ +blk_mode_t mode =0 ; + +if (file->f_mode &FMODE_READ ) + mode |=BLK_OPEN_READ ; +if (file->f_mode &FMODE_WRITE ) + mode |=BLK_OPEN_WRITE ; +if (file->f_mode &FMODE_EXCL ) + mode |=BLK_OPEN_EXCL ; +if ((file->f_flags &O_ACCMODE ) ==3 )I really don't like magic numbers like this.
Quoted 6 lines
Groan,
O_RDONLYbeing defined as 0 strikes again... Becuase of this quirk we internally map
O_RDONLY(0)->FMODE_READ(1)O_WRONLY(1)->FMODE_WRITE(2)O_RDWR(3)-> (FMODE_READ|FMODE_WRITE)
s/O_RDWR(3)/O_RDWR(2)/
Quoted 13 lines
so checking for the raw 3 here is confusing in addition to being a magic number as it could give the impression that what's checked here is (
O_WRONLY|O_RDWR) which doesn't make sense...So my perference would be in descending order of preference:
(
file->f_flags&O_ACCMODE) == (FMODE_READ|FMODE_WRITE)or while a little less clear but informative enough for people familiar with the
O_RDONLYquirk:if ((
file->f_flags&O_ACCMODE) ==O_ACCMODE)
Christoph Hellwig
maintainerRe: [PATCH 28/31] block: replace fmode_t with a block-specific type for block open flags
In reply to Christian BraunerQuoted 5 lines · Christian Brauner
Quoted 2 lines · Christoph Hellwig
The only overlap between the block open flags mapped into the
fmode_tand other uses offmode_tareFMODE_READandFMODE_WRITE. Define a newand
FMODE_EXCLafaict
FMODE_EXCL isn't used outside the block layer and removed in the last patch.
Quoted 5 lines
Quoted 5 lines
block/fops.c +5
-0+blk_mode_t file_to_blk_mode (struct file *file) +{ +blk_mode_t mode =0 ; + +if (file->f_mode &FMODE_READ )
Quoted 8 lines
block/fops.c static int blkdev_fsync(struct file *filp, loff_t start, loff_t end, · line 483
Quoted 6 lines
block/fops.c +6
-0+ mode |=BLK_OPEN_READ ; +if (file->f_mode &FMODE_WRITE ) + mode |=BLK_OPEN_WRITE ; +if (file->f_mode &FMODE_EXCL ) + mode |=BLK_OPEN_EXCL ; +if ((file->f_flags &O_ACCMODE ) ==3 )I really don't like magic numbers like this.
I don't like them either, but this is just moved around and not new.
Quoted 6 lines
Groan,
O_RDONLYbeing defined as 0 strikes again... Becuase of this quirk we internally map
O_RDONLY(0)->FMODE_READ(1)O_WRONLY(1)->FMODE_WRITE(2)O_RDWR(3)-> (FMODE_READ|FMODE_WRITE)
O_RDWR is 2.
Quoted 3 lines
so checking for the raw 3 here is confusing in addition to being a magic number as it could give the impression that what's checked here is (
O_WRONLY|O_RDWR) which doesn't make sense...
Well, that is exactly what we check for. This is a 30-ish year old quirk only used in the floppy driver.
Quoted 8 lines
So my perference would be in descending order of preference:
(
file->f_flags&O_ACCMODE) == (FMODE_READ|FMODE_WRITE)or while a little less clear but informative enough for people familiar with the
O_RDONLYquirk:if ((
file->f_flags&O_ACCMODE) ==O_ACCMODE)
I don't understand this part. Especially the above doesn't make any sense as FMODE_READ and FMODE_WRITE are in a completely different symbol space to O_*, and not a UAPІ but a kernel internal thing that could be renumbered any time.
Christian Brauner
maintainerRe: [PATCH 28/31] block: replace fmode_t with a block-specific type for block open flags
Quoted 26 lines · Christoph Hellwig
Quoted 5 lines · Christian Brauner
Quoted 2 lines · Christoph Hellwig
The only overlap between the block open flags mapped into the
fmode_tand other uses offmode_tareFMODE_READandFMODE_WRITE. Define a newand
FMODE_EXCLafaict
FMODE_EXCLisn't used outside the block layer and removed in the last patch.Quoted 5 lines
Quoted 5 lines
block/fops.c +5
-0+blk_mode_t file_to_blk_mode (struct file *file) +{ +blk_mode_t mode =0 ; + +if (file->f_mode &FMODE_READ )Quoted 8 lines
block/fops.c static int blkdev_fsync(struct file *filp, loff_t start, loff_t end, · line 483
Quoted 6 lines
block/fops.c +6
-0+ mode |=BLK_OPEN_READ ; +if (file->f_mode &FMODE_WRITE ) + mode |=BLK_OPEN_WRITE ; +if (file->f_mode &FMODE_EXCL ) + mode |=BLK_OPEN_EXCL ; +if ((file->f_flags &O_ACCMODE ) ==3 )I really don't like magic numbers like this.
I don't like them either, but this is just moved around and not new.
Quoted 8 lines
Quoted 6 lines
Groan,
O_RDONLYbeing defined as 0 strikes again... Becuase of this quirk we internally map
O_RDONLY(0)->FMODE_READ(1)O_WRONLY(1)->FMODE_WRITE(2)O_RDWR(3)-> (FMODE_READ|FMODE_WRITE)
O_RDWRis 2.
Yeah, that was a typo. See the other mail I sent right after:
https://lore.kernel.org/all/20230607-kribbeln-dilettanten-b901b57dd962@brauner
Quoted 7 lines
Quoted 4 lines
so checking for the raw 3 here is confusing in addition to being a magic number as it could give the impression that what's checked here is (
O_WRONLY|O_RDWR) which doesn't make sense...Well, that is exactly what we check for. This is a 30-ish year old quirk only used in the floppy driver.
Ugh, it's f_flags. I misread that as f_mode...
This is rather ugly. Then please, make it explicit and check for == (O_WRONLY | O_RDWR) and leave a brief comment.
Anything's better than that raw 3 in there. We just had fun with figuring out why there was a raw coredump in fs/coredump.c 30 years later.
Re: [PATCH 28/31] block: replace fmode_t with a block-specific type for block open flags
In reply to Christoph HellwigQuoted 21 lines · On Tue, Jun 6, 2023 at 9:41 AM Christoph Hellwig…
The only overlap between the block open flags mapped into the
fmode_tand other uses offmode_tareFMODE_READandFMODE_WRITE. Define a newblk_mode_tinstead for use in blkdev_get_by_*, ->open and ->ioctl and stop abusingfmode_t.Signed-off-by Christoph Hellwig <[email protected]>--- arch/um/drivers/ubd_kern.c | 8 +++--- arch/xtensa/platforms/iss/simdisk.c | 2 +- block/bdev.c | 32 +++++++++++----------- block/blk-zoned.c | 8 +++--- block/blk.h | 11 ++++---- block/fops.c | 26 +++++++++++++----- block/genhd.c | 8 +++--- block/ioctl.c | 42 +++++++++-------------------- drivers/block/amiflop.c | 12 ++++----- drivers/block/aoe/aoeblk.c | 4 +-- drivers/block/ataflop.c | 25 +++++++++-------- drivers/block/drbd/drbd_main.c | 7 ++--- drivers/block/drbd/drbd_nl.c | 2 +-
Quoted 8 lines
drivers/block/floppy.c | 28 +++++++++---------- drivers/block/loop.c | 22 +++++++-------- drivers/block/mtip32xx/mtip32xx.c | 4 +-- drivers/block/nbd.c | 4 +-- drivers/block/pktcdvd.c | 17 ++++++------ drivers/block/rbd.c | 2 +- drivers/block/rnbd/rnbd-clt.c | 4 +-- drivers/block/rnbd/rnbd-srv.c | 4 +--
Christoph Hellwig
maintainerPATCH 29/31 block: always use I_BDEV on file->f_mapping->host to find the bdev
In reply to Christoph HellwigAlways use I_BDEV(file->f_mapping->host) to find the bdev for a file to free up file->private_data for other uses.
--- block/fops.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-)
block/fops.c +8 -10
@@ -54,7 +54,7 @@ static bool blkdev_dio_unaligned(struct block_device *bdev, loff_t pos,static ssize_t __blkdev_direct_IO_simple (struct kiocb *iocb,struct iov_iter *iter,unsigned int nr_pages) { -struct block_device *bdev = iocb->ki_filp->private_data; +struct block_device *bdev =I_BDEV (iocb->ki_filp->f_mapping->host);struct bio_vec inline_vecs[DIO_INLINE_BIO_VECS ], *vecs;loff_t pos = iocb->ki_pos;bool should_dirty = false;
@@ -170,7 +170,7 @@ static void blkdev_bio_end_io(struct bio *bio)static ssize_t __blkdev_direct_IO (struct kiocb *iocb,struct iov_iter *iter,unsigned int nr_pages) { -struct block_device *bdev = iocb->ki_filp->private_data; +struct block_device *bdev =I_BDEV (iocb->ki_filp->f_mapping->host);struct blk_plug plug;struct blkdev_dio *dio;struct bio *bio;
@@ -310,7 +310,7 @@ static ssize_t __blkdev_direct_IO_async(struct kiocb *iocb, struct iov_iter *iter, unsigned int nr_pages) { -struct block_device *bdev = iocb->ki_filp->private_data; +struct block_device *bdev =I_BDEV (iocb->ki_filp->f_mapping->host);bool is_read =iov_iter_rw (iter) ==READ ;blk_opf_t opf = is_read ?REQ_OP_READ :dio_bio_write_op (iocb);struct blkdev_dio *dio;
@@ -451,7 +451,7 @@ static loff_t blkdev_llseek(struct file *file, loff_t offset, int whence)static int blkdev_fsync (struct file *filp,loff_t start,loff_t end,int datasync) { -struct block_device *bdev = filp->private_data; +struct block_device *bdev =I_BDEV (filp->f_mapping->host);int error; error =file_write_and_wait_range (filp, start, end);
@@ -510,7 +510,6 @@ static int blkdev_open(struct inode *inode, struct file *filp)if (IS_ERR (bdev))return PTR_ERR (bdev); - filp->private_data = bdev; filp->f_mapping = bdev->bd_inode->i_mapping; filp->f_wb_err =filemap_sample_wb_err (filp->f_mapping);return 0 ;
@@ -518,9 +517,8 @@ static int blkdev_open(struct inode *inode, struct file *filp)static int blkdev_release (struct inode *inode,struct file *filp) { -struct block_device *bdev = filp->private_data; - -blkdev_put (bdev, (filp->f_mode &FMODE_EXCL ) ? filp :NULL ); +blkdev_put (I_BDEV (filp->f_mapping->host), + (filp->f_mode &FMODE_EXCL ) ? filp :NULL );return 0 ; }
@@ -533,7 +531,7 @@ static int blkdev_release(struct inode *inode, struct file *filp)*/ static ssize_t blkdev_write_iter (struct kiocb *iocb,struct iov_iter *from) { -struct block_device *bdev = iocb->ki_filp->private_data; +struct block_device *bdev =I_BDEV (iocb->ki_filp->f_mapping->host);struct inode *bd_inode = bdev->bd_inode;loff_t size =bdev_nr_bytes (bdev);size_t shorted =0 ;
@@ -569,7 +567,7 @@ static ssize_t blkdev_write_iter(struct kiocb *iocb, struct iov_iter *from)static ssize_t blkdev_read_iter (struct kiocb *iocb,struct iov_iter *to) { -struct block_device *bdev = iocb->ki_filp->private_data; +struct block_device *bdev =I_BDEV (iocb->ki_filp->f_mapping->host);loff_t size =bdev_nr_bytes (bdev);loff_t pos = iocb->ki_pos;size_t shorted =0 ;
Signature · 1 line
2.39.2
Re: [PATCH 29/31] block: always use I_BDEV on file->f_mapping->host to find the bdev
Quoted 5 lines · Christoph Hellwig
Always use
I_BDEV(file->f_mapping->host)to find the bdev for a file to free upfile->private_datafor other uses.Signed-off-by Christoph Hellwig <[email protected]>---
Looks good to me,
Re: [PATCH 29/31] block: always use I_BDEV on file->f_mapping->host to find the bdev
In reply to Christoph HellwigQuoted 8 lines · Christoph Hellwig
Always use
I_BDEV(file->f_mapping->host)to find the bdev for a file to free upfile->private_datafor other uses.Signed-off-by Christoph Hellwig <[email protected]>--- block/fops.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-)
Cheers,
Hannes
Christoph Hellwig
maintainerPATCH 30/31 block: store the holder in file->private_data
In reply to Christoph HellwigStore the file struct used as the holder in file->private_data as an indicator that this file descriptor was opened exclusively to remove the last use of FMODE_EXCL.
--- block/fops.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-)
block/fops.c +8 -6
@@ -478,7 +478,7 @@ blk_mode_t file_to_blk_mode(struct file *file) mode |=BLK_OPEN_READ ;if (file->f_mode &FMODE_WRITE ) mode |=BLK_OPEN_WRITE ; -if (file->f_mode &FMODE_EXCL ) +if (file->private_data) mode |=BLK_OPEN_EXCL ;if ((file->f_flags &O_ACCMODE ) ==3 ) mode |=BLK_OPEN_WRITE_IOCTL ;
@@ -501,12 +501,15 @@ static int blkdev_open(struct inode *inode, struct file *filp) filp->f_flags |=O_LARGEFILE ; filp->f_mode |=FMODE_NOWAIT |FMODE_BUF_RASYNC ; +/* +* Use the file private data to store the holder, file_to_blk_mode +* relies on this. +*/ if (filp->f_flags &O_EXCL ) - filp->f_mode |=FMODE_EXCL ; + filp->private_data = filp; bdev =blkdev_get_by_dev (inode->i_rdev,file_to_blk_mode (filp), - (filp->f_mode &FMODE_EXCL ) ? filp :NULL , -NULL ); + filp->private_data,NULL );if (IS_ERR (bdev))return PTR_ERR (bdev);
@@ -517,8 +520,7 @@ static int blkdev_open(struct inode *inode, struct file *filp)static int blkdev_release (struct inode *inode,struct file *filp) { -blkdev_put (I_BDEV (filp->f_mapping->host), - (filp->f_mode &FMODE_EXCL ) ? filp :NULL ); +blkdev_put (I_BDEV (filp->f_mapping->host), filp->private_data);return 0 ; }
Signature · 1 line
2.39.2
Re: [PATCH 30/31] block: store the holder in file->private_data
Quoted 6 lines · Christoph Hellwig
Store the file struct used as the holder in
file->private_dataas an indicator that this file descriptor was opened exclusively to remove the last use ofFMODE_EXCL.Signed-off-by Christoph Hellwig <[email protected]>---
Feels a bit odd to store the object itself but anyway,
Christoph Hellwig
maintainerRe: [PATCH 30/31] block: store the holder in file->private_data
Quoted 10 lines · Christian Brauner
Quoted 6 lines · Christoph Hellwig
Store the file struct used as the holder in
file->private_dataas an indicator that this file descriptor was opened exclusively to remove the last use ofFMODE_EXCL.Signed-off-by Christoph Hellwig <[email protected]>---
Feels a bit odd to store the object itself but anyway,
We could literally store anything we want. The only reason I picked the file is because: a) we have it around and b) that allows passing it to blkdev_put without a branch in blkdev_release.
If you prefer something else I can change it.
Re: [PATCH 30/31] block: store the holder in file->private_data
In reply to Christoph HellwigQuoted 23 lines · Christoph Hellwig
Store the file struct used as the holder in
file->private_dataas an indicator that this file descriptor was opened exclusively to remove the last use ofFMODE_EXCL.Signed-off-by Christoph Hellwig <[email protected]>--- block/fops.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-)block/fops.c +1
-1@@ -478,7 +478,7 @@ blk_mode_t file_to_blk_mode(struct file *file) mode |=BLK_OPEN_READ ;if (file->f_mode &FMODE_WRITE ) mode |=BLK_OPEN_WRITE ; -if (file->f_mode &FMODE_EXCL ) +if (file->private_data) mode |=BLK_OPEN_EXCL ;if ((file->f_flags &O_ACCMODE ) ==3 ) mode |=BLK_OPEN_WRITE_IOCTL ;
block/fops.c static int blkdev_open(struct inode *inode, struct file *filp) · line 507
Quoted 7 lines
block/fops.c +4
-0@@ -501,12 +501,15 @@ static int blkdev_open(struct inode *inode, struct file *filp) filp->f_flags |=O_LARGEFILE ; filp->f_mode |=FMODE_NOWAIT |FMODE_BUF_RASYNC ; +/* +* Use the file private data to store the holder, file_to_blk_mode +* relies on this. +*/
Can you update the comment to reflect that we're only use the ->private_data field for exclusive open?
I know it's indicated by the condition, but we really should be clarify this usage.
Quoted 12 lines
block/fops.c +2
-3if (filp->f_flags &O_EXCL ) - filp->f_mode |=FMODE_EXCL ; + filp->private_data = filp; bdev =blkdev_get_by_dev (inode->i_rdev,file_to_blk_mode (filp), - (filp->f_mode &FMODE_EXCL ) ? filp :NULL , -NULL ); + filp->private_data,NULL );if (IS_ERR (bdev))return PTR_ERR (bdev);
block/fops.c static int blkdev_open(struct inode *inode, struct file *filp) · line 526
Quoted 9 lines
block/fops.c +1
-2@@ -517,8 +520,7 @@ static int blkdev_open(struct inode *inode, struct file *filp)static int blkdev_release (struct inode *inode,struct file *filp) { -blkdev_put (I_BDEV (filp->f_mapping->host), - (filp->f_mode &FMODE_EXCL ) ? filp :NULL ); +blkdev_put (I_BDEV (filp->f_mapping->host), filp->private_data);return 0 ; }
Other than that:
Cheers,
Hannes
Christoph Hellwig
maintainerPATCH 31/31 fs: remove the now unused FMODE_* flags
In reply to Christoph HellwigFMODE_NDELAY, FMODE_EXCL and FMODE_WRITE_IOCTL were only used for block internal purposed and are now entirely unused, so remove them.
--- include/linux/fs.h | 7 ------- 1 file changed, 7 deletions(-)
include/linux/fs.h +0 -7
@@ -119,13 +119,6 @@ typedef int (dio_iodone_t)(struct kiocb *iocb, loff_t offset,#define FMODE_PWRITE ((__force fmode_t)0x10)/* File is opened for execution with sys_execve / sys_uselib */ #define FMODE_EXEC ((__force fmode_t)0x20) -/* File is opened with O_NDELAY (only set for block devices) */ -#define FMODE_NDELAY ((__force fmode_t)0x40) -/* File is opened with O_EXCL (only set for block devices) */ -#define FMODE_EXCL ((__force fmode_t)0x80) -/* File is opened using open(.., 3, ..) and is writeable only for ioctls -(specialy hack for floppy.c) */ -#define FMODE_WRITE_IOCTL ((__force fmode_t)0x100)/* 32bit hashes as llseek() offset (for directories) */ #define FMODE_32BITHASH ((__force fmode_t)0x200)/* 64bit hashes as llseek() offset (for directories) */
Signature · 1 line
2.39.2
Re: [PATCH 31/31] fs: remove the now unused FMODE_* flags
Quoted 5 lines · Christoph Hellwig
FMODE_NDELAY,FMODE_EXCLandFMODE_WRITE_IOCTLwere only used for block internal purposed and are now entirely unused, so remove them.Signed-off-by Christoph Hellwig <[email protected]>---
Love it,
Re: [PATCH 31/31] fs: remove the now unused FMODE_* flags
In reply to Christoph HellwigQuoted 8 lines · Christoph Hellwig
FMODE_NDELAY,FMODE_EXCLandFMODE_WRITE_IOCTLwere only used for block internal purposed and are now entirely unused, so remove them.Signed-off-by Christoph Hellwig <[email protected]>--- include/linux/fs.h | 7 ------- 1 file changed, 7 deletions(-)
Cheers,
Hannes
Christian Brauner
maintainerQuoted 3 lines · Christoph Hellwig
Hi all,
this series adds a new
blk_mode_tfor block open flags instead of abusing
Trying to look at this series applied but doesn't apply cleanly for anything v6.4-rc* related. What tree is this on?
Christoph Hellwig
maintainerQuoted 7 lines · Christian Brauner
Quoted 3 lines · Christoph Hellwig
Hi all,
this series adds a new
blk_mode_tfor block open flags instead of abusingTrying to look at this series applied but doesn't apply cleanly for anything v6.4-rc* related. What tree is this on?
Jens' for-6.5/block tree.
I also have a git tree here:
git://git.infradead.org/users/hch/block.git blk-open-release
Gitweb:
http://git.infradead.org/users/hch/block.git/shortlog/refs/heads/blk-open-release
Christian Brauner
maintainerQuoted 11 lines · Christoph Hellwig
Quoted 7 lines · Christian Brauner
Quoted 3 lines · Christoph Hellwig
Hi all,
this series adds a new
blk_mode_tfor block open flags instead of abusingTrying to look at this series applied but doesn't apply cleanly for anything v6.4-rc* related. What tree is this on?
Jens' for-6.5/block tree.
Quoted 7 lines
I also have a git tree here:
git://git.infradead.org/users/hch/block.gitblk-open-releaseGitweb:
http://git.infradead.org/users/hch/block.git/shortlog/refs/heads/blk-open-release
Thanks! I pulled from your tree.