UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

scsi: allow passing in null rq to scsi_prep_state_check() 

In the following patch, we will implement scsi_get_budget()
which need to call scsi_prep_state_check() when rq isn't
dequeued yet.

Signed-off-by: Ming Lei <ming.lei@redhat.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Ming Lei 2017-10-14 17:22:31 +08:00 committed by Jens Axboe
parent b347689ffb
commit aeec77629a
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/scsi/scsi_lib.c
View File

@ -1301,7 +1301,7 @@ scsi_prep_state_check(struct scsi_device *sdev, struct request *req)
/* /*
* If the devices is blocked we defer normal commands. * If the devices is blocked we defer normal commands.
*/ */
if (!(req->rq_flags & RQF_PREEMPT)) if (req && !(req->rq_flags & RQF_PREEMPT))
ret = BLKPREP_DEFER; ret = BLKPREP_DEFER;
break; break;
default: default:
@ -1310,7 +1310,7 @@ scsi_prep_state_check(struct scsi_device *sdev, struct request *req)
* special commands. In particular any user initiated * special commands. In particular any user initiated
* command is not allowed. * command is not allowed.
*/ */
if (!(req->rq_flags & RQF_PREEMPT)) if (req && !(req->rq_flags & RQF_PREEMPT))
ret = BLKPREP_KILL; ret = BLKPREP_KILL;
break; break;
} }