diff options
| author | Christoph Hellwig <hch@lst.de> | 2017-07-06 19:32:20 +0200 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2017-07-06 20:23:51 +0200 |
| commit | 0e2ff11311d1d4c85dd9ad9ba4347775f628e94a (patch) | |
| tree | 9da3743be15cfcbbecbff5c5f215d8b9301712f9 /drivers/block/cciss.c | |
| parent | null_blk: fix error flow for shared tags during module_init (diff) | |
| download | linux-0e2ff11311d1d4c85dd9ad9ba4347775f628e94a.tar.xz linux-0e2ff11311d1d4c85dd9ad9ba4347775f628e94a.zip | |
cciss: initialize struct scsi_req
The changes in "block: Make most scsi_req_init() calls implicit" mean
that every driver that supports the generic scsi ioctls needs to
call scsi_req_init on newly allocated requests, but that commit didn't
add the call to the ccіss driver. Fix that to avoid crashes when
udev issues SG_IO commands.
Fixes: ca18d6f7 ("block: Make most scsi_req_init() calls implicit")
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reported-by: Meelis Roos <mroos@linux.ee>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'drivers/block/cciss.c')
| -rw-r--r-- | drivers/block/cciss.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c index 02a611993bb4..678af946be30 100644 --- a/drivers/block/cciss.c +++ b/drivers/block/cciss.c @@ -1944,6 +1944,13 @@ static void cciss_get_serial_no(ctlr_info_t *h, int logvol, return; } +static void cciss_initialize_rq(struct request *rq) +{ + struct scsi_request *sreq = blk_mq_rq_to_pdu(rq); + + scsi_req_init(sreq); +} + /* * cciss_add_disk sets up the block device queue for a logical drive */ @@ -1956,6 +1963,7 @@ static int cciss_add_disk(ctlr_info_t *h, struct gendisk *disk, disk->queue->cmd_size = sizeof(struct scsi_request); disk->queue->request_fn = do_cciss_request; + disk->queue->initialize_rq_fn = cciss_initialize_rq; disk->queue->queue_lock = &h->lock; queue_flag_set_unlocked(QUEUE_FLAG_SCSI_PASSTHROUGH, disk->queue); if (blk_init_allocated_queue(disk->queue) < 0) |