Skip to content

Commit

Permalink
block: remove the unused mode argument to ->release
Browse files Browse the repository at this point in the history 
The mode argument to the ->release block_device_operation is never used,
so remove it.

Signed-off-by: Christoph Hellwig <[email protected]>
Reviewed-by: Hannes Reinecke <[email protected]>
Acked-by: Christian Brauner <[email protected]>
Acked-by: Jack Wang <[email protected]>			[rnbd]
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Jens Axboe <[email protected]>
  • Loading branch information
@axboe
Christoph Hellwig authored and axboe committed Jun 12, 2023
1 parent d32e2bf commit ae22076
Show file tree
Hide file tree
Showing 30 changed files with 41 additions and 43 deletions.
4 changes: 2 additions & 2 deletions arch/um/drivers/ubd_kern.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion arch/xtensa/platforms/iss/simdisk.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
14 changes: 7 additions & 7 deletions block/bdev.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -699,19 +699,19 @@ 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);

if (atomic_dec_and_test(&part->bd_openers)) {
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)
Expand Down Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion drivers/block/amiflop.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion drivers/block/aoe/aoeblk.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions drivers/block/ataflop.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 **************************/

Expand Down Expand Up @@ -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);
Expand Down
4 changes: 2 additions & 2 deletions drivers/block/drbd/drbd_main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion drivers/block/floppy.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion drivers/block/loop.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion drivers/block/nbd.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
4 changes: 2 additions & 2 deletions drivers/block/pktcdvd.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2292,7 +2292,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;

Expand Down Expand Up @@ -2616,7 +2616,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,
Expand Down
2 changes: 1 addition & 1 deletion drivers/block/rbd.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion drivers/block/rnbd/rnbd-clt.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion drivers/block/swim.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
3 changes: 1 addition & 2 deletions drivers/block/swim3.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion drivers/block/z2ram.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion drivers/cdrom/gdrom.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion drivers/md/bcache/super.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion drivers/md/dm.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion drivers/md/md.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion drivers/mmc/core/block.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion drivers/mtd/mtd_blkdevs.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion drivers/mtd/ubi/block.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion drivers/nvme/host/core.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
2 changes: 1 addition & 1 deletion drivers/nvme/host/multipath.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
2 changes: 1 addition & 1 deletion drivers/s390/block/dasd.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
4 changes: 2 additions & 2 deletions drivers/s390/block/dcssblk.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
#define DCSS_BUS_ID_SIZE 20

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 long dcssblk_dax_direct_access(struct dax_device *dax_dev, pgoff_t pgoff,
long nr_pages, enum dax_access_mode mode, void **kaddr,
Expand Down Expand Up @@ -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;
Expand Down
3 changes: 1 addition & 2 deletions drivers/scsi/sd.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.
*
Expand All @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion drivers/scsi/sr.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
2 changes: 1 addition & 1 deletion include/linux/blkdev.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down

0 comments on commit ae22076

Please sign in to comment.