Commit 0624cbb1 authored by Bart Van Assche's avatar Bart Van Assche Committed by Martin K. Petersen
Browse files

scsi: sd: sr: Convert two assignments into warning statements 



Before scsi_prep_fn() calls the ULP .init_command() callback
function it stores the SCSI command pointer in request.special.
This means that the SCpnt = rq->special assignments in the sd
and sr drivers assign a pointer to itself. Hence convert these
two assignment statements into warning statements.

Signed-off-by: default avatarBart Van Assche <bart.vanassche@sandisk.com>
Reviewed-by: default avatarHannes Reinecke <hare@suse.com>
Reviewed-by: default avatarJohannes Thumshirn <jthumshirn@suse.de>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent bed2213d

drivers/scsi/sd.c

+1 −1
Original line number Diff line number Diff line
@@ -1013,7 +1013,7 @@ static int sd_setup_read_write_cmnd(struct scsi_cmnd *SCpnt) 
	ret = scsi_init_io(SCpnt);

	if (ret != BLKPREP_OK)

		goto out;

	SCpnt = rq->special;

	WARN_ON_ONCE(SCpnt != rq->special);



	/* from here on until we're complete, any goto out

	 * is used for a killable error condition */

drivers/scsi/sr.c

+1 −1
Original line number Diff line number Diff line
@@ -393,7 +393,7 @@ static int sr_init_command(struct scsi_cmnd *SCpnt) 
	ret = scsi_init_io(SCpnt);

	if (ret != BLKPREP_OK)

		goto out;

	SCpnt = rq->special;

	WARN_ON_ONCE(SCpnt != rq->special);

	cd = scsi_cd(rq->rq_disk);



	/* from here on until we're complete, any goto out