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

Commit 51aef716 authored by Lance Roy's avatar Lance Roy Committed by Martin K. Petersen
Browse files

scsi: snic: Replace spin_is_locked() with lockdep 



lockdep_assert_held() is better suited to checking locking requirements, since
it won't get confused when someone else holds the lock. This is also a step
towards possibly removing spin_is_locked().

Signed-off-by: default avatarLance Roy <ldr709@gmail.com>
Cc: Karan Tilak Kumar <kartilak@cisco.com>
Cc: Sesidhar Baddela <sebaddel@cisco.com>
Cc: "James E.J. Bottomley" <jejb@linux.vnet.ibm.com>
Cc: "Martin K. Petersen" <martin.petersen@oracle.com>
Cc: <linux-scsi@vger.kernel.org>
Reviewed-by: default avatarBart Van Assche <bvanassche@acm.org>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent b51d577a

drivers/scsi/snic/snic_scsi.c

+2 −2
Original line number Diff line number Diff line
@@ -2001,7 +2001,7 @@ snic_dr_finish(struct snic *snic, struct scsi_cmnd *sc) 
	}



dr_failed:

	SNIC_BUG_ON(!spin_is_locked(io_lock));

	lockdep_assert_held(io_lock);

	if (rqi)

		CMD_SP(sc) = NULL;

	spin_unlock_irqrestore(io_lock, flags);
@@ -2604,7 +2604,7 @@ snic_internal_abort_io(struct snic *snic, struct scsi_cmnd *sc, int tmf) 
	ret = SUCCESS;



skip_internal_abts:

	SNIC_BUG_ON(!spin_is_locked(io_lock));

	lockdep_assert_held(io_lock);

	spin_unlock_irqrestore(io_lock, flags);



	return ret;