diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-04-18 12:10:19 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-04-18 12:10:19 -0700 |
| commit | 2668e3ae2ef36d5e7c52f818ad7d90822c037de4 (patch) | |
| tree | bb483bd11a62213af9d2f5c719ab411e09eb96bd /drivers/scsi/scsi_lib.c | |
| parent | 7586c8501d090609c6eb1af6ba05e3ed68806c83 (diff) | |
| parent | ca91259b775f6fd98ae5d23bb4eec101d468ba8d (diff) | |
| download | linux-2668e3ae2ef36d5e7c52f818ad7d90822c037de4.tar.gz linux-2668e3ae2ef36d5e7c52f818ad7d90822c037de4.tar.bz2 linux-2668e3ae2ef36d5e7c52f818ad7d90822c037de4.zip | |
Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
Pull SCSI fixes from James Bottomley:
"Two minor fixes: one in the core to improve the handling of warnings
and unconditionally clear the command flags when ending a request and
the other to add missing table values needed for bandwidth scaling in
qualcomm ufs"
* tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
scsi: core: Fix handling of SCMD_FAIL_IF_RECOVERING
scsi: ufs: qcom: Add missing interconnect bandwidth values for Gear 5
Diffstat (limited to 'drivers/scsi/scsi_lib.c')
| -rw-r--r-- | drivers/scsi/scsi_lib.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c index 2e28e2360c85..5b3230ef51fe 100644 --- a/drivers/scsi/scsi_lib.c +++ b/drivers/scsi/scsi_lib.c @@ -635,10 +635,9 @@ static bool scsi_end_request(struct request *req, blk_status_t error, if (blk_queue_add_random(q)) add_disk_randomness(req->q->disk); - if (!blk_rq_is_passthrough(req)) { - WARN_ON_ONCE(!(cmd->flags & SCMD_INITIALIZED)); - cmd->flags &= ~SCMD_INITIALIZED; - } + WARN_ON_ONCE(!blk_rq_is_passthrough(req) && + !(cmd->flags & SCMD_INITIALIZED)); + cmd->flags = 0; /* * Calling rcu_barrier() is not necessary here because the |