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

block: remove __blkdev_driver_ioctl 



Just open code it in the few callers.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 98f49b63

block/ioctl.c

+5 −20
Original line number Diff line number Diff line
@@ -219,23 +219,6 @@ static int compat_put_ulong(compat_ulong_t __user *argp, compat_ulong_t val) 
}

#endif



int __blkdev_driver_ioctl(struct block_device *bdev, fmode_t mode,

			unsigned cmd, unsigned long arg)

{

	struct gendisk *disk = bdev->bd_disk;



	if (disk->fops->ioctl)

		return disk->fops->ioctl(bdev, mode, cmd, arg);



	return -ENOTTY;

}

/*

 * For the record: _GPL here is only because somebody decided to slap it

 * on the previous export.  Sheer idiocy, since it wasn't copyrightable

 * at all and could be open-coded without any exports by anybody who cares.

 */

EXPORT_SYMBOL_GPL(__blkdev_driver_ioctl);



#ifdef CONFIG_COMPAT

/*

 * This is the equivalent of compat_ptr_ioctl(), to be used by block
@@ -594,10 +577,12 @@ int blkdev_ioctl(struct block_device *bdev, fmode_t mode, unsigned cmd, 
	}



	ret = blkdev_common_ioctl(bdev, mode, cmd, arg, argp);

	if (ret == -ENOIOCTLCMD)

		return __blkdev_driver_ioctl(bdev, mode, cmd, arg);



	if (ret != -ENOIOCTLCMD)

		return ret;



	if (!bdev->bd_disk->fops->ioctl)

		return -ENOTTY;

	return bdev->bd_disk->fops->ioctl(bdev, mode, cmd, arg);

}

EXPORT_SYMBOL_GPL(blkdev_ioctl); /* for /dev/raw */

drivers/block/pktcdvd.c

+4 −2
Original line number Diff line number Diff line
@@ -2584,9 +2584,11 @@ static int pkt_ioctl(struct block_device *bdev, fmode_t mode, unsigned int cmd, 
	case CDROM_LAST_WRITTEN:

	case CDROM_SEND_PACKET:

	case SCSI_IOCTL_SEND_COMMAND:

		ret = __blkdev_driver_ioctl(pd->bdev, mode, cmd, arg);

		if (!bdev->bd_disk->fops->ioctl)

			ret = -ENOTTY;

		else

			ret = bdev->bd_disk->fops->ioctl(bdev, mode, cmd, arg);

		break;



	default:

		pkt_dbg(2, pd, "Unknown ioctl (%x)\n", cmd);

		ret = -ENOTTY;

drivers/md/bcache/request.c

+3 −2
Original line number Diff line number Diff line
@@ -1230,8 +1230,9 @@ static int cached_dev_ioctl(struct bcache_device *d, fmode_t mode, 


	if (dc->io_disable)

		return -EIO;



	return __blkdev_driver_ioctl(dc->bdev, mode, cmd, arg);

	if (!dc->bdev->bd_disk->fops->ioctl)

		return -ENOTTY;

	return dc->bdev->bd_disk->fops->ioctl(dc->bdev, mode, cmd, arg);

}



void bch_cached_dev_request_init(struct cached_dev *dc)

drivers/md/dm.c

+4 −1
Original line number Diff line number Diff line
@@ -570,7 +570,10 @@ static int dm_blk_ioctl(struct block_device *bdev, fmode_t mode, 
		}

	}



	r =  __blkdev_driver_ioctl(bdev, mode, cmd, arg);

	if (!bdev->bd_disk->fops->ioctl)

		r = -ENOTTY;

	else

		r = bdev->bd_disk->fops->ioctl(bdev, mode, cmd, arg);

out:

	dm_unprepare_ioctl(md, srcu_idx);

	return r;

include/linux/blkdev.h

+0 −2
Original line number Diff line number Diff line
@@ -1867,8 +1867,6 @@ extern int blkdev_compat_ptr_ioctl(struct block_device *, fmode_t, 
#define blkdev_compat_ptr_ioctl NULL

#endif



extern int __blkdev_driver_ioctl(struct block_device *, fmode_t, unsigned int,

				 unsigned long);

extern int bdev_read_page(struct block_device *, sector_t, struct page *);

extern int bdev_write_page(struct block_device *, sector_t, struct page *,

						struct writeback_control *);