Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4fc93089 authored by Bart Van Assche's avatar Bart Van Assche Committed by Jens Axboe
Browse files

ide: Make ide_cdrom_prep_fs() initialize the sense buffer pointer 



The changes introduced through commit 82ed4db4 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 82ed4db4 ("block: split scsi_request out of struct request")
Signed-off-by: default avatarBart Van Assche <bart.vanassche@wdc.com>
Cc: Christoph Hellwig <hch@lst.de>
Cc: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 37cb8e1f

drivers/ide/ide-cd.c

+1 −2
Original line number Diff line number Diff line
@@ -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;