mirrors/scst
1
0
Fork 0
mirror of https://github.com/SCST-project/scst.git synced 2026-05-17 18:51:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'svn-trunk'

Browse Source
This commit is contained in:
Bart Van Assche
2019-11-29 13:34:07 -08:00
parent 241d0d2c74 df61d43643
commit ca1ff8018c
3 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
nightly/conf/nightly.conf
View File

@@ -3,7 +3,8 @@
ABT_DETAILS="x86_64"
ABT_JOBS=5
ABT_KERNELS=" \
5.3.13 \
5.4.1 \
5.3.14-nc \
5.2.21-nc \
5.1.21-nc \
5.0.21-nc \
@@ -18,12 +19,12 @@ ABT_KERNELS=" \
4.12.14-nc \
4.11.12-nc \
4.10.17-nc \
4.9.202-nc \
4.9.205-nc \
4.8.17-nc \
4.7.10-nc \
4.6.7-nc \
4.5.7-nc \
4.4.202-nc \
4.4.205-nc \
4.3.6-nc \
4.2.8-nc \
4.1.52-nc \

8
qla2x00t-32gbit/qla_mid.c
View File

@@ -76,9 +76,11 @@ qla24xx_deallocate_vp_id(scsi_qla_host_t *vha)
* ensures no active vp_list traversal while the vport is removed
* from the queue)
*/
for (i = 0; i < 10 && atomic_read(&vha->vref_count); i++)
wait_event_timeout(vha->vref_waitq,
atomic_read(&vha->vref_count), HZ);
for (i = 0; i < 10; i++) {
if (wait_event_timeout(vha->vref_waitq,
!atomic_read(&vha->vref_count), HZ) > 0)
break;
}
spin_lock_irqsave(&ha->vport_slock, flags);
if (atomic_read(&vha->vref_count)) {

8
qla2x00t-32gbit/qla_os.c
View File

@@ -1156,9 +1156,11 @@ qla2x00_wait_for_sess_deletion(scsi_qla_host_t *vha)
qla2x00_mark_all_devices_lost(vha, 0);
for (i = 0; i < 10; i++)
wait_event_timeout(vha->fcport_waitQ, test_fcport_count(vha),
HZ);
for (i = 0; i < 10; i++) {
if (wait_event_timeout(vha->fcport_waitQ,
test_fcport_count(vha), HZ) > 0)
break;
}
flush_workqueue(vha->hw->wq);
}