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

qla2x00t: Eliminate double req_q_cnt checks when there is enough headroom (merge r4135 from trunk)

Browse Source 
git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/2.2.x@4632 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
Bart Van Assche
2012-11-28 14:02:31 +00:00
parent e0e724f022
commit caf9e827e9
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
qla2x00t/qla2x00-target/qla2x00t.c
View File

@@ -2087,15 +2087,15 @@ static int q2t_check_reserve_free_req(scsi_qla_host_t *ha, uint32_t req_cnt)
else
ha->req_q_cnt = ha->request_q_length -
(ha->req_ring_index - cnt);
}
if (unlikely(ha->req_q_cnt < (req_cnt + 2))) {
TRACE(TRACE_OUT_OF_MEM, "qla2x00t(%ld): There is no room in the "
"request ring: ha->req_ring_index=%d, ha->req_q_cnt=%d, "
"req_cnt=%d", ha->instance, ha->req_ring_index,
ha->req_q_cnt, req_cnt);
res = SCST_TGT_RES_QUEUE_FULL;
goto out;
if (unlikely(ha->req_q_cnt < (req_cnt + 2))) {
TRACE(TRACE_OUT_OF_MEM, "qla2x00t(%ld): There is no room in the "
"request ring: ha->req_ring_index=%d, ha->req_q_cnt=%d, "
"req_cnt=%d", ha->instance, ha->req_ring_index,
ha->req_q_cnt, req_cnt);
res = SCST_TGT_RES_QUEUE_FULL;
goto out;
}
}
ha->req_q_cnt -= req_cnt;