diff options
| author | Bart Van Assche <bart.vanassche@sandisk.com> | 2017-05-31 14:43:48 -0700 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2017-06-01 13:10:43 -0600 |
| commit | ec2be6a98e50d3eb9f35f70aa51c5d2c23737c55 (patch) | |
| tree | 29d1fe09f4b4135a36e7872f4c1c461d72f7dcba /drivers/block/pktcdvd.c | |
| parent | d9f972644606ecc2581390b43cb5a980b54c04bf (diff) | |
| download | blackbird-op-linux-ec2be6a98e50d3eb9f35f70aa51c5d2c23737c55.tar.gz blackbird-op-linux-ec2be6a98e50d3eb9f35f70aa51c5d2c23737c55.zip | |
pktcdvd: Check queue type before attaching to a queue
Since the pktcdvd driver only supports request queues for which
struct scsi_request is the first member of their private request
data, refuse to register block layer queues for which struct
scsi_request is not the first member of the private data.
References: commit 82ed4db499b8 ("block: split scsi_request out of struct request")
Signed-off-by: Bart Van Assche <bart.vanassche@sandisk.com>
Reviewed-by: Hannes Reinecke <hare@suse.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Cc: Omar Sandoval <osandov@fb.com>
Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'drivers/block/pktcdvd.c')
| -rw-r--r-- | drivers/block/pktcdvd.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/block/pktcdvd.c b/drivers/block/pktcdvd.c index 205b865ebeb9..42e3c880a8a5 100644 --- a/drivers/block/pktcdvd.c +++ b/drivers/block/pktcdvd.c @@ -2583,6 +2583,11 @@ static int pkt_new_dev(struct pktcdvd_device *pd, dev_t dev) bdev = bdget(dev); if (!bdev) return -ENOMEM; + if (!blk_queue_scsi_passthrough(bdev_get_queue(bdev))) { + WARN_ONCE(true, "Attempt to register a non-SCSI queue\n"); + bdput(bdev); + return -EINVAL; + } ret = blkdev_get(bdev, FMODE_READ | FMODE_NDELAY, NULL); if (ret) return ret; |
