diff options
| author | Ming Lei <ming.lei@redhat.com> | 2017-10-14 11:22:31 +0200 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2017-11-01 15:20:02 +0100 |
| commit | aeec77629a4ac6f8c248f3a82e80d4170a881f22 (patch) | |
| tree | b7a500ba2ada9f2e70d4adc8a608095aa6f63045 | |
| parent | blk-mq-sched: improve dispatching from sw queue (diff) | |
| download | linux-aeec77629a4ac6f8c248f3a82e80d4170a881f22.tar.xz linux-aeec77629a4ac6f8c248f3a82e80d4170a881f22.zip | |
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>
| -rw-r--r-- | drivers/scsi/scsi_lib.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c index 9cf6a80fe297..d159bb085714 100644 --- a/drivers/scsi/scsi_lib.c +++ b/drivers/scsi/scsi_lib.c @@ -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 (!(req->rq_flags & RQF_PREEMPT)) + if (req && !(req->rq_flags & RQF_PREEMPT)) ret = BLKPREP_DEFER; break; default: @@ -1310,7 +1310,7 @@ scsi_prep_state_check(struct scsi_device *sdev, struct request *req) * special commands. In particular any user initiated * command is not allowed. */ - if (!(req->rq_flags & RQF_PREEMPT)) + if (req && !(req->rq_flags & RQF_PREEMPT)) ret = BLKPREP_KILL; break; } |