Commit 29cadd2b authored Dec 07, 2018 by Dan Carpenter Committed by Jens Axboe Dec 07, 2018

scsi: Fix a harmless double shift bug



Smatch generates a warning:

    drivers/scsi/scsi_lib.c:1656 scsi_mq_done() warn: test_bit() takes a bit number

The problem is that SCMD_STATE_COMPLETE is supposed to be bit number 0
and not a mask like "(1 << 0)".  It is used like this:

        if (test_and_set_bit(SCMD_STATE_COMPLETE, &scmd->state))

The test_and_set_bit() has a shift built in so it's a double left shift
and uses bit number 1 instead of number 0.  This bug is harmless because
it's done consistently and it doesn't clash with any other flags.

Fixes: f1342709 ("scsi: Do not rely on blk-mq for double completions")
Reviewed-by: Keith Busch <keith.busch@intel.com>
Acked-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

parent 3236b458

include/scsi/scsi_cmnd.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -62,7 +62,7 @@ struct scsi_pointer {
		#define SCMD_PRESERVED_FLAGS (SCMD_UNCHECKED_ISA_DMA \| SCMD_INITIALIZED)

		/* for scmd->state */
		#define SCMD_STATE_COMPLETE (1 << 0)
		#define SCMD_STATE_COMPLETE 0

		struct scsi_cmnd {
		struct scsi_request req;