diff options
| author | Vinod Koul <vkoul@kernel.org> | 2020-09-11 15:15:36 +0300 |
|---|---|---|
| committer | Vinod Koul <vkoul@kernel.org> | 2020-09-11 15:15:36 +0300 |
| commit | 4c80e9323967125ab8aa7c271ccc7624abc08832 (patch) | |
| tree | c9881b5814c184aa0c1cb58c6383beab9173e388 /drivers/scsi/scsi_debug.c | |
| parent | ef759e4a28c88965972c815af6023f41bd733316 (diff) | |
| parent | f4d51dffc6c01a9e94650d95ce0104964f8ae822 (diff) | |
| download | linux-4c80e9323967125ab8aa7c271ccc7624abc08832.tar.xz | |
Merge tag 'v5.9-rc4' into next
Linux 5.9-rc4
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 064ed680c053..1ad7260d4758 100644 --- a/drivers/scsi/scsi_debug.c +++ b/drivers/scsi/scsi_debug.c @@ -4482,8 +4482,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); @@ -5490,9 +5488,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 */ |