Commit ca91259b authored by Bart Van Assche's avatar Bart Van Assche Committed by Martin K. Petersen
Browse files

scsi: core: Fix handling of SCMD_FAIL_IF_RECOVERING 



There is code in the SCSI core that sets the SCMD_FAIL_IF_RECOVERING
flag but there is no code that clears this flag. Instead of only clearing
SCMD_INITIALIZED in scsi_end_request(), clear all flags. It is never
necessary to preserve any command flags inside scsi_end_request().

Cc: stable@vger.kernel.org
Fixes: 310bcaef ("scsi: core: Support failing requests while recovering")
Signed-off-by: default avatarBart Van Assche <bvanassche@acm.org>
Link: https://lore.kernel.org/r/20240325224417.1477135-1-bvanassche@acm.org


Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 8db8f6ce

drivers/scsi/scsi_lib.c

+3 −4
Original line number Diff line number Diff line
@@ -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