|
@@ -154,7 +154,7 @@ static void uas_mark_cmd_dead(struct uas_dev_info *devinfo,
|
|
|
struct scsi_cmnd *cmnd = container_of(scp, struct scsi_cmnd, SCp);
|
|
|
|
|
|
uas_log_cmd_state(cmnd, caller);
|
|
|
- WARN_ON_ONCE(!spin_is_locked(&devinfo->lock));
|
|
|
+ lockdep_assert_held(&devinfo->lock);
|
|
|
WARN_ON_ONCE(cmdinfo->state & COMMAND_ABORTED);
|
|
|
cmdinfo->state |= COMMAND_ABORTED;
|
|
|
cmdinfo->state &= ~IS_IN_WORK_LIST;
|
|
@@ -181,7 +181,7 @@ static void uas_add_work(struct uas_cmd_info *cmdinfo)
|
|
|
struct scsi_cmnd *cmnd = container_of(scp, struct scsi_cmnd, SCp);
|
|
|
struct uas_dev_info *devinfo = cmnd->device->hostdata;
|
|
|
|
|
|
- WARN_ON_ONCE(!spin_is_locked(&devinfo->lock));
|
|
|
+ lockdep_assert_held(&devinfo->lock);
|
|
|
cmdinfo->state |= IS_IN_WORK_LIST;
|
|
|
schedule_work(&devinfo->work);
|
|
|
}
|
|
@@ -283,7 +283,7 @@ static int uas_try_complete(struct scsi_cmnd *cmnd, const char *caller)
|
|
|
struct uas_cmd_info *cmdinfo = (void *)&cmnd->SCp;
|
|
|
struct uas_dev_info *devinfo = (void *)cmnd->device->hostdata;
|
|
|
|
|
|
- WARN_ON_ONCE(!spin_is_locked(&devinfo->lock));
|
|
|
+ lockdep_assert_held(&devinfo->lock);
|
|
|
if (cmdinfo->state & (COMMAND_INFLIGHT |
|
|
|
DATA_IN_URB_INFLIGHT |
|
|
|
DATA_OUT_URB_INFLIGHT |
|
|
@@ -622,7 +622,7 @@ static int uas_submit_urbs(struct scsi_cmnd *cmnd,
|
|
|
struct urb *urb;
|
|
|
int err;
|
|
|
|
|
|
- WARN_ON_ONCE(!spin_is_locked(&devinfo->lock));
|
|
|
+ lockdep_assert_held(&devinfo->lock);
|
|
|
if (cmdinfo->state & SUBMIT_STATUS_URB) {
|
|
|
urb = uas_submit_sense_urb(cmnd, gfp, cmdinfo->stream);
|
|
|
if (!urb)
|