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: Lance 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: Bart Van Assche <bvanassche@acm.org>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
This commit is contained in:
Lance Roy 2018-10-02 22:38:55 -07:00 коммит произвёл Martin K. Petersen
Родитель b51d577a51
Коммит 51aef71617
1 изменённых файлов: 2 добавлений и 2 удалений

Просмотреть файл

@ -2001,7 +2001,7 @@ snic_dr_finish(struct snic *snic, struct scsi_cmnd *sc)
} }
dr_failed: dr_failed:
SNIC_BUG_ON(!spin_is_locked(io_lock)); lockdep_assert_held(io_lock);
if (rqi) if (rqi)
CMD_SP(sc) = NULL; CMD_SP(sc) = NULL;
spin_unlock_irqrestore(io_lock, flags); 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; ret = SUCCESS;
skip_internal_abts: skip_internal_abts:
SNIC_BUG_ON(!spin_is_locked(io_lock)); lockdep_assert_held(io_lock);
spin_unlock_irqrestore(io_lock, flags); spin_unlock_irqrestore(io_lock, flags);
return ret; return ret;