diff options
| author | Brian King <brking@linux.vnet.ibm.com> | 2013-04-01 09:44:26 -0500 |
|---|---|---|
| committer | James Bottomley <JBottomley@Parallels.com> | 2013-04-06 11:35:51 +0100 |
| commit | 9d85b590057523c2bfe3bea2f62ba9e2701a62db (patch) | |
| tree | 98cc614b92df45164fb3d987be910db4162c2707 | |
| parent | 231ff54e4cc4a6f1ef78fb4e1f94957bbb961aae (diff) | |
| download | linux-stable-9d85b590057523c2bfe3bea2f62ba9e2701a62db.tar.gz linux-stable-9d85b590057523c2bfe3bea2f62ba9e2701a62db.tar.bz2 linux-stable-9d85b590057523c2bfe3bea2f62ba9e2701a62db.zip | |
[SCSI] ibmvscsi: Fix slave_configure deadlock
No locks should be held when calling scsi_adjust_queue_depth
so drop the lock in slave_configure prior to calling it.
Signed-off-by: Brian King <brking@linux.vnet.ibm.com>
Acked-by: Robert Jennings <rcj@linux.vnet.ibm.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
| -rw-r--r-- | drivers/scsi/ibmvscsi/ibmvscsi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/ibmvscsi/ibmvscsi.c b/drivers/scsi/ibmvscsi/ibmvscsi.c index a044f593e8b9..d0fa4b6c551f 100644 --- a/drivers/scsi/ibmvscsi/ibmvscsi.c +++ b/drivers/scsi/ibmvscsi/ibmvscsi.c @@ -1899,8 +1899,8 @@ static int ibmvscsi_slave_configure(struct scsi_device *sdev) sdev->allow_restart = 1; blk_queue_rq_timeout(sdev->request_queue, 120 * HZ); } - scsi_adjust_queue_depth(sdev, 0, shost->cmd_per_lun); spin_unlock_irqrestore(shost->host_lock, lock_flags); + scsi_adjust_queue_depth(sdev, 0, shost->cmd_per_lun); return 0; } |