diff options
| author | Christoph Hellwig <hch@lst.de> | 2020-11-03 11:00:18 +0100 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2020-11-16 08:14:29 -0700 |
| commit | a7cb3d2f09c8405aed59d97a7d02cebea43cd3c7 (patch) | |
| tree | 620ec73e4343bdbf571d27cf53975682d33e0ab9 /drivers/block/pktcdvd.c | |
| parent | 98f49b63e84d4ee1a5c327d0b5f4e8699f6c70fe (diff) | |
block: remove __blkdev_driver_ioctl
Just open code it in the few callers.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'drivers/block/pktcdvd.c')
| -rw-r--r-- | drivers/block/pktcdvd.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/block/pktcdvd.c b/drivers/block/pktcdvd.c index 467dbd06b7cd..ef1c1f094ea4 100644 --- a/drivers/block/pktcdvd.c +++ b/drivers/block/pktcdvd.c @@ -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; |