Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-15 13:15:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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: Bart Van Assche <bart.vanassche@sandisk.com>
Reviewed-by: Hannes Reinecke <hare@suse.com>
Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
This commit is contained in:
Bart Van Assche 2017-08-25 13:46:33 -07:00 committed by Martin K. Petersen
parent bed2213d01
commit 0624cbb1e2
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/scsi/sd.c
View File

@ -1013,7 +1013,7 @@ static int sd_setup_read_write_cmnd(struct scsi_cmnd *SCpnt)
ret = scsi_init_io(SCpnt); ret = scsi_init_io(SCpnt);
if (ret != BLKPREP_OK) if (ret != BLKPREP_OK)
goto out; goto out;
SCpnt = rq->special; WARN_ON_ONCE(SCpnt != rq->special);
/* from here on until we're complete, any goto out /* from here on until we're complete, any goto out
* is used for a killable error condition */ * is used for a killable error condition */

2
drivers/scsi/sr.c
View File

@ -393,7 +393,7 @@ static int sr_init_command(struct scsi_cmnd *SCpnt)
ret = scsi_init_io(SCpnt); ret = scsi_init_io(SCpnt);
if (ret != BLKPREP_OK) if (ret != BLKPREP_OK)
goto out; goto out;
SCpnt = rq->special; WARN_ON_ONCE(SCpnt != rq->special);
cd = scsi_cd(rq->rq_disk); cd = scsi_cd(rq->rq_disk);
/* from here on until we're complete, any goto out /* from here on until we're complete, any goto out