Commit 5e4ea834 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

block: remove unused fmode_t arguments from ioctl handlers 



A few ioctl handlers have fmode_t arguments that are entirely unused,
remove them.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Acked-by: default avatarChristian Brauner <brauner@kernel.org>
Reviewed-by: default avatarHannes Reinecke <hare@suse.de>
Link: https://lore.kernel.org/r/20230608110258.189493-27-hch@lst.de


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent cfb42576

block/blk-zoned.c

+2 −2
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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: