[PATCH 4.9 52/77] scsi: qla2xxx: Correction to vha->vref_count timeout

2017-09-24 Thread Greg Kroah-Hartman
4.9-stable review patch.  If anyone has any objections, please let me know.

--

From: Joe Carnuccio 

commit 6e98095f8fb6d98da34c4e6c34e69e7c638d79c0 upstream.

Fix incorrect second argument for wait_event_timeout()

Fixes: c4a9b538ab2a ("qla2xxx: Allow vref count to timeout on vport delete.")
Signed-off-by: Joe Carnuccio 
Signed-off-by: Himanshu Madhani 
Signed-off-by: Martin K. Petersen 
Signed-off-by: Greg Kroah-Hartman 

---
 drivers/scsi/qla2xxx/qla_mid.c |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- a/drivers/scsi/qla2xxx/qla_mid.c
+++ b/drivers/scsi/qla2xxx/qla_mid.c
@@ -74,7 +74,7 @@ qla24xx_deallocate_vp_id(scsi_qla_host_t
 * ensures no active vp_list traversal while the vport is removed
 * from the queue)
 */
-   wait_event_timeout(vha->vref_waitq, atomic_read(>vref_count),
+   wait_event_timeout(vha->vref_waitq, !atomic_read(>vref_count),
10*HZ);
 
spin_lock_irqsave(>vport_slock, flags);




[PATCH 4.9 52/77] scsi: qla2xxx: Correction to vha->vref_count timeout

2017-09-24 Thread Greg Kroah-Hartman
4.9-stable review patch.  If anyone has any objections, please let me know.

--

From: Joe Carnuccio 

commit 6e98095f8fb6d98da34c4e6c34e69e7c638d79c0 upstream.

Fix incorrect second argument for wait_event_timeout()

Fixes: c4a9b538ab2a ("qla2xxx: Allow vref count to timeout on vport delete.")
Signed-off-by: Joe Carnuccio 
Signed-off-by: Himanshu Madhani 
Signed-off-by: Martin K. Petersen 
Signed-off-by: Greg Kroah-Hartman 

---
 drivers/scsi/qla2xxx/qla_mid.c |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- a/drivers/scsi/qla2xxx/qla_mid.c
+++ b/drivers/scsi/qla2xxx/qla_mid.c
@@ -74,7 +74,7 @@ qla24xx_deallocate_vp_id(scsi_qla_host_t
 * ensures no active vp_list traversal while the vport is removed
 * from the queue)
 */
-   wait_event_timeout(vha->vref_waitq, atomic_read(>vref_count),
+   wait_event_timeout(vha->vref_waitq, !atomic_read(>vref_count),
10*HZ);
 
spin_lock_irqsave(>vport_slock, flags);