On 05/24/2017 02:34 AM, Bart Van Assche wrote:
> 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
> Cc: Jens Axboe
> Cc: Christoph Hellwig
> Cc: Omar Sandoval
> Cc: Hannes Reinecke
> Cc: linux-bl...@vger.kernel.org
> ---
> drivers/block/pktcdvd.c | 5 +
> 1 file changed, 5 insertions(+)
>
> diff --git a/drivers/block/pktcdvd.c b/drivers/block/pktcdvd.c
> index 205b865ebeb9..b8ce55d7911d 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_sup(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;
>
Reviewed-by: Hannes Reinecke
Cheers,
Hannes
--
Dr. Hannes ReineckeTeamlead Storage & Networking
h...@suse.de +49 911 74053 688
SUSE LINUX GmbH, Maxfeldstr. 5, 90409 Nürnberg
GF: F. Imendörffer, J. Smithard, J. Guild, D. Upmanyu, G. Norton
HRB 21284 (AG Nürnberg)
