Gh0st
/
linux
mirror of https://github.com/torvalds/linux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

block: remove the unused mode argument to ->release 

The mode argument to the ->release block_device_operation is never used,
so remove it.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Hannes Reinecke <hare@suse.de>
Acked-by: Christian Brauner <brauner@kernel.org>
Acked-by: Jack Wang <jinpu.wang@ionos.com>			[rnbd]
Link: https://lore.kernel.org/r/20230608110258.189493-10-hch@lst.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Christoph Hellwig 2023-06-08 13:02:37 +02:00 committed by Jens Axboe
parent d32e2bf837
commit ae220766d8
30 changed files with 41 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/um/drivers/ubd_kern.c
View File

@ -109,7 +109,7 @@ static DEFINE_MUTEX(ubd_lock);
static DEFINE_MUTEX(ubd_mutex); /* replaces BKL, might not be needed */ 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, 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, static int ubd_ioctl(struct block_device *bdev, fmode_t mode,
unsigned int cmd, unsigned long arg); unsigned int cmd, unsigned long arg);
static int ubd_getgeo(struct block_device *bdev, struct hd_geometry *geo); 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; 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; struct ubd *ubd_dev = disk->private_data;

2
arch/xtensa/platforms/iss/simdisk.c
View File

@ -130,7 +130,7 @@ static int simdisk_open(struct gendisk *disk, fmode_t mode)
return 0; 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; struct simdisk *dev = disk->private_data;
spin_lock(&dev->lock); spin_lock(&dev->lock);

14
block/bdev.c
View File

@ -670,12 +670,12 @@ static int blkdev_get_whole(struct block_device *bdev, fmode_t mode)
return 0; 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)) if (atomic_dec_and_test(&bdev->bd_openers))
blkdev_flush_mapping(bdev); blkdev_flush_mapping(bdev);
if (bdev->bd_disk->fops->release) 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) 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; return 0;
out_blkdev_put: out_blkdev_put:
blkdev_put_whole(bdev_whole(part), mode); blkdev_put_whole(bdev_whole(part));
return ret; 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); 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); blkdev_flush_mapping(part);
whole->bd_disk->open_partitions--; whole->bd_disk->open_partitions--;
} }
blkdev_put_whole(whole, mode); blkdev_put_whole(whole);
} }
struct block_device *blkdev_get_no_open(dev_t dev) 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); disk_flush_events(disk, DISK_EVENT_MEDIA_CHANGE);
if (bdev_is_partition(bdev)) if (bdev_is_partition(bdev))
blkdev_put_part(bdev, mode); blkdev_put_part(bdev);
else else
blkdev_put_whole(bdev, mode); blkdev_put_whole(bdev);
mutex_unlock(&disk->open_mutex); mutex_unlock(&disk->open_mutex);
module_put(disk->fops->owner); module_put(disk->fops->owner);

2
drivers/block/amiflop.c
View File

@ -1709,7 +1709,7 @@ static int floppy_open(struct gendisk *disk, fmode_t mode)
return 0; 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; struct amiga_floppy_struct *p = disk->private_data;
int drive = p - unit; int drive = p - unit;

2
drivers/block/aoe/aoeblk.c
View File

@ -232,7 +232,7 @@ aoeblk_open(struct gendisk *disk, fmode_t mode)
} }
static void static void
aoeblk_release(struct gendisk *disk, fmode_t mode) aoeblk_release(struct gendisk *disk)
{ {
struct aoedev *d = disk->private_data; struct aoedev *d = disk->private_data;
ulong flags; ulong flags;

4
drivers/block/ataflop.c
View File

@ -448,7 +448,7 @@ static void fd_probe( int drive );
static int fd_test_drive_present( int drive ); static int fd_test_drive_present( int drive );
static void config_types( void ); static void config_types( void );
static int floppy_open(struct gendisk *disk, fmode_t mode); 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 **************************/ /************************* End of Prototypes **************************/
@ -1964,7 +1964,7 @@ static int floppy_unlocked_open(struct gendisk *disk, fmode_t mode)
return ret; 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; struct atari_floppy_struct *p = disk->private_data;
mutex_lock(&ataflop_mutex); mutex_lock(&ataflop_mutex);

4
drivers/block/drbd/drbd_main.c
View File

@ -50,7 +50,7 @@
static DEFINE_MUTEX(drbd_main_mutex); static DEFINE_MUTEX(drbd_main_mutex);
static int drbd_open(struct gendisk *disk, 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 drbd_release(struct gendisk *gd);
static void md_sync_timer_fn(struct timer_list *t); static void md_sync_timer_fn(struct timer_list *t);
static int w_bitmap_io(struct drbd_work *w, int unused); 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; 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; struct drbd_device *device = gd->private_data;
mutex_lock(&drbd_main_mutex); mutex_lock(&drbd_main_mutex);

2
drivers/block/floppy.c
View File

@ -3963,7 +3963,7 @@ static void __init config_types(void)
pr_cont("\n"); 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; int drive = (long)disk->private_data;

2
drivers/block/loop.c
View File

@ -1727,7 +1727,7 @@ static int lo_compat_ioctl(struct block_device *bdev, fmode_t mode,
} }
#endif #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; struct loop_device *lo = disk->private_data;

2
drivers/block/nbd.c
View File

@ -1597,7 +1597,7 @@ static int nbd_open(struct gendisk *disk, fmode_t mode)
return ret; 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; struct nbd_device *nbd = disk->private_data;

4
drivers/block/pktcdvd.c
View File

@ -2292,7 +2292,7 @@ static int pkt_open(struct gendisk *disk, fmode_t mode)
return ret; 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; struct pktcdvd_device *pd = disk->private_data;
@ -2616,7 +2616,7 @@ static const struct block_device_operations pktcdvd_ops = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.submit_bio = pkt_submit_bio, .submit_bio = pkt_submit_bio,
.open = pkt_open, .open = pkt_open,
.release = pkt_close, .release = pkt_release,
.ioctl = pkt_ioctl, .ioctl = pkt_ioctl,
.compat_ioctl = blkdev_compat_ptr_ioctl, .compat_ioctl = blkdev_compat_ptr_ioctl,
.check_events = pkt_check_events, .check_events = pkt_check_events,

2
drivers/block/rbd.c
View File

@ -679,7 +679,7 @@ static int rbd_open(struct gendisk *disk, fmode_t mode)
return 0; 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; struct rbd_device *rbd_dev = disk->private_data;
unsigned long open_count_before; unsigned long open_count_before;

2
drivers/block/rnbd/rnbd-clt.c
View File

@ -935,7 +935,7 @@ static int rnbd_client_open(struct gendisk *disk, fmode_t mode)
return 0; 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; struct rnbd_clt_dev *dev = gen->private_data;

2
drivers/block/swim.c
View File

@ -670,7 +670,7 @@ static int floppy_unlocked_open(struct gendisk *disk, fmode_t mode)
return ret; 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 floppy_state *fs = disk->private_data;
struct swim __iomem *base = fs->swd->base; struct swim __iomem *base = fs->swd->base;

3
drivers/block/swim3.c
View File

@ -249,7 +249,6 @@ 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, fmode_t mode,
unsigned int cmd, unsigned long param); unsigned int cmd, unsigned long param);
static int floppy_open(struct gendisk *disk, 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, static unsigned int floppy_check_events(struct gendisk *disk,
unsigned int clearing); unsigned int clearing);
static int floppy_revalidate(struct gendisk *disk); 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; 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 floppy_state *fs = disk->private_data;
struct swim3 __iomem *sw = fs->swim3; struct swim3 __iomem *sw = fs->swim3;

2
drivers/block/z2ram.c
View File

@ -288,7 +288,7 @@ static int z2_open(struct gendisk *disk, fmode_t mode)
return rc; return rc;
} }
static void z2_release(struct gendisk *disk, fmode_t mode) static void z2_release(struct gendisk *disk)
{ {
mutex_lock(&z2ram_mutex); mutex_lock(&z2ram_mutex);
if (current_device == -1) { if (current_device == -1) {

2
drivers/cdrom/gdrom.c
View File

@ -486,7 +486,7 @@ static int gdrom_bdops_open(struct gendisk *disk, fmode_t mode)
return ret; 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); mutex_lock(&gdrom_mutex);
cdrom_release(gd.cd_info, mode); cdrom_release(gd.cd_info, mode);

2
drivers/md/bcache/super.c
View File

@ -743,7 +743,7 @@ static int open_dev(struct gendisk *disk, fmode_t mode)
return 0; 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; struct bcache_device *d = b->private_data;

2
drivers/md/dm.c
View File

@ -334,7 +334,7 @@ static int dm_blk_open(struct gendisk *disk, fmode_t mode)
return md ? 0 : -ENXIO; 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; struct mapped_device *md;

2
drivers/md/md.c
View File

@ -7799,7 +7799,7 @@ static int md_open(struct gendisk *disk, fmode_t mode)
return err; 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; struct mddev *mddev = disk->private_data;

2
drivers/mmc/core/block.c
View File

@ -375,7 +375,7 @@ static int mmc_blk_open(struct gendisk *disk, fmode_t mode)
return ret; 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; struct mmc_blk_data *md = disk->private_data;

2
drivers/mtd/mtd_blkdevs.c
View File

@ -225,7 +225,7 @@ static int blktrans_open(struct gendisk *disk, fmode_t mode)
return ret; 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; struct mtd_blktrans_dev *dev = disk->private_data;

2
drivers/mtd/ubi/block.c
View File

@ -270,7 +270,7 @@ static int ubiblock_open(struct gendisk *disk, fmode_t mode)
return ret; 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; struct ubiblock *dev = gd->private_data;

2
drivers/nvme/host/core.c
View File

@ -1596,7 +1596,7 @@ static int nvme_open(struct gendisk *disk, fmode_t mode)
return nvme_ns_open(disk->private_data); 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); nvme_ns_release(disk->private_data);
} }

2
drivers/nvme/host/multipath.c
View File

@ -409,7 +409,7 @@ static int nvme_ns_head_open(struct gendisk *disk, fmode_t mode)
return 0; 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); nvme_put_ns_head(disk->private_data);
} }

2
drivers/s390/block/dasd.c
View File

@ -3287,7 +3287,7 @@ static int dasd_open(struct gendisk *disk, fmode_t mode)
return rc; 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); struct dasd_device *base = dasd_device_from_gendisk(disk);
if (base) { if (base) {

4
drivers/s390/block/dcssblk.c
View File

@ -29,7 +29,7 @@
#define DCSS_BUS_ID_SIZE 20 #define DCSS_BUS_ID_SIZE 20
static int dcssblk_open(struct gendisk *disk, 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_release(struct gendisk *disk);
static void dcssblk_submit_bio(struct bio *bio); static void dcssblk_submit_bio(struct bio *bio);
static long dcssblk_dax_direct_access(struct dax_device *dax_dev, pgoff_t pgoff, static long dcssblk_dax_direct_access(struct dax_device *dax_dev, pgoff_t pgoff,
long nr_pages, enum dax_access_mode mode, void **kaddr, long nr_pages, enum dax_access_mode mode, void **kaddr,
@ -825,7 +825,7 @@ dcssblk_open(struct gendisk *disk, fmode_t mode)
} }
static void 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 dcssblk_dev_info *dev_info = disk->private_data;
struct segment_info *entry; struct segment_info *entry;

3
drivers/scsi/sd.c
View File

@ -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 * sd_release - invoked when the (last) close(2) is called on this
* scsi disk. * scsi disk.
* @disk: disk to release * @disk: disk to release
* @mode: FMODE_* mask
* *
* Returns 0. * 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. * 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_disk *sdkp = scsi_disk(disk);
struct scsi_device *sdev = sdkp->device; struct scsi_device *sdev = sdkp->device;

2
drivers/scsi/sr.c
View File

@ -507,7 +507,7 @@ static int sr_block_open(struct gendisk *disk, fmode_t mode)
return ret; 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); struct scsi_cd *cd = scsi_cd(disk);

2
include/linux/blkdev.h
View File

@ -1387,7 +1387,7 @@ struct block_device_operations {
int (*poll_bio)(struct bio *bio, struct io_comp_batch *iob, int (*poll_bio)(struct bio *bio, struct io_comp_batch *iob,
unsigned int flags); unsigned int flags);
int (*open)(struct gendisk *disk, fmode_t mode); 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 (*ioctl) (struct block_device *, fmode_t, unsigned, unsigned long);
int (*compat_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, unsigned int (*check_events) (struct gendisk *disk,