Skip to content

Commit

Permalink
ide: Make ide_cdrom_prep_fs() initialize the sense buffer pointer
Browse files Browse the repository at this point in the history
The changes introduced through commit 82ed4db assume that the
sense buffer pointer in struct scsi_request is initialized for all
requests - passthrough and filesystem requests. Hence make sure
that that pointer is initialized for filesystem requests. Remove
the memset() call that clears .cmd because the scsi_req_init()
call in ide_initialize_rq() already initializes the .cmd.

Fixes: commit 82ed4db ("block: split scsi_request out of struct request")
Signed-off-by: Bart Van Assche <bart.vanassche@wdc.com>
Cc: Christoph Hellwig <hch@lst.de>
Cc: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
  • Loading branch information
Bart Van Assche authored and Jens Axboe committed Nov 15, 2017
1 parent 37cb8e1 commit 4fc9308
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions drivers/ide/ide-cd.c
Original file line number Diff line number Diff line change
Expand Up @@ -1333,8 +1333,7 @@ static int ide_cdrom_prep_fs(struct request_queue *q, struct request *rq)
unsigned long blocks = blk_rq_sectors(rq) / (hard_sect >> 9);
struct scsi_request *req = scsi_req(rq);

scsi_req_init(req);
memset(req->cmd, 0, BLK_MAX_CDB);
q->initialize_rq_fn(rq);

if (rq_data_dir(rq) == READ)
req->cmd[0] = GPCMD_READ_10;
Expand Down

0 comments on commit 4fc9308

Please sign in to comment.