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

Commit aeec7762 authored by Ming Lei's avatar Ming Lei Committed by Jens Axboe
Browse files

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: default avatarMing Lei <ming.lei@redhat.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent b347689f

drivers/scsi/scsi_lib.c

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

		}