diff options
| author | Martin K. Petersen <martin.petersen@oracle.com> | 2020-09-15 11:24:32 -0400 |
|---|---|---|
| committer | Martin K. Petersen <martin.petersen@oracle.com> | 2020-09-15 11:36:40 -0400 |
| commit | 02f7415054d7054955fd3c43902ad79437b09fbc (patch) | |
| tree | 87a7def48bbe373a820109805b974b53b1d382fa /drivers/scsi/scsi_debug.c | |
| parent | 2de7649cff445ec35a6c5ee1a8e19be186d890fc (diff) | |
| parent | 244359c99fd90f1c61c3944f93250f8219435c75 (diff) | |
| download | linux-02f7415054d7054955fd3c43902ad79437b09fbc.tar.gz linux-02f7415054d7054955fd3c43902ad79437b09fbc.tar.bz2 linux-02f7415054d7054955fd3c43902ad79437b09fbc.zip | |
Merge branch '5.9/scsi-fixes' into 5.10/scsi-ufs
Resolve UFS discrepancies between fixes and queue.
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Diffstat (limited to 'drivers/scsi/scsi_debug.c')
| -rw-r--r-- | drivers/scsi/scsi_debug.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/scsi_debug.c b/drivers/scsi/scsi_debug.c index 0a98bdbd5ed4..181c33abc3c9 100644 --- a/drivers/scsi/scsi_debug.c +++ b/drivers/scsi/scsi_debug.c @@ -4487,8 +4487,6 @@ static int resp_open_zone(struct scsi_cmnd *scp, struct sdebug_dev_info *devip) goto fini; } - if (zc == ZC2_IMPLICIT_OPEN) - zbc_close_zone(devip, zsp); zbc_open_zone(devip, zsp, true); fini: write_unlock(macc_lckp); @@ -5500,9 +5498,11 @@ static int schedule_resp(struct scsi_cmnd *cmnd, struct sdebug_dev_info *devip, u64 d = ktime_get_boottime_ns() - ns_from_boot; if (kt <= d) { /* elapsed duration >= kt */ + spin_lock_irqsave(&sqp->qc_lock, iflags); sqcp->a_cmnd = NULL; atomic_dec(&devip->num_in_q); clear_bit(k, sqp->in_use_bm); + spin_unlock_irqrestore(&sqp->qc_lock, iflags); if (new_sd_dp) kfree(sd_dp); /* call scsi_done() from this thread */ |