From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr1-f68.google.com ([209.85.221.68]:38514 "EHLO mail-wr1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388100AbeGWO0G (ORCPT ); Mon, 23 Jul 2018 10:26:06 -0400 Received: by mail-wr1-f68.google.com with SMTP id v14-v6so711655wro.5 for ; Mon, 23 Jul 2018 06:24:51 -0700 (PDT) From: Jack Wang To: gregkh@linuxfoundation.org, stable@vger.kernel.org Cc: Ming Lei , Jens Axboe , Jack Wang Subject: [stable-4.14 05/23] scsi: allow passing in null rq to scsi_prep_state_check() Date: Mon, 23 Jul 2018 15:24:27 +0200 Message-Id: <1532352285-13589-6-git-send-email-jinpuwang@gmail.com> In-Reply-To: <1532352285-13589-1-git-send-email-jinpuwang@gmail.com> References: <1532352285-13589-1-git-send-email-jinpuwang@gmail.com> Sender: stable-owner@vger.kernel.org List-ID: From: Ming Lei commit aeec77629a4ac6f8c248f3a82e80d4170a881f22 upstream 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 Signed-off-by: Jens Axboe Signed-off-by: Jack Wang --- drivers/scsi/scsi_lib.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c index bfd8f12d4e9a..0ecc74421b1f 100644 --- a/drivers/scsi/scsi_lib.c +++ b/drivers/scsi/scsi_lib.c @@ -1331,7 +1331,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: @@ -1340,7 +1340,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; } -- 2.7.4