From 406fef799e124629806a9a4b08ad753cad05d7c3 Mon Sep 17 00:00:00 2001 From: Stanislaw Gruszka Date: Sat, 23 May 2009 11:45:35 +0000 Subject: [PATCH] Backport r780 to 1.0.1.x branch. git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/1.0.1.x@885 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- qla_isp/linux/isp_scst.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/qla_isp/linux/isp_scst.c b/qla_isp/linux/isp_scst.c index 4f1686e5f..f9bbb5ffa 100644 --- a/qla_isp/linux/isp_scst.c +++ b/qla_isp/linux/isp_scst.c @@ -1107,12 +1107,12 @@ isp_rdy_to_xfer(struct scst_cmd *scst_cmd) } SDprintk2("%s: TMD[%llx] write nbytes %u\n", __FUNCTION__, tmd->cd_tagval, scst_cmd_get_bufflen(scst_cmd)); - up_read(&bc->disable_sem); (*bp->h.r_action)(QIN_TMD_CONT, xact); + up_read(&bc->disable_sem); /* * Did we have an error starting this particular transaction? */ - if (unlikely(xact->td_lflags & (TDFL_ERROR|TDFL_SYNCERROR)) == (TDFL_ERROR|TDFL_SYNCERROR)) { + if (unlikely((xact->td_lflags & (TDFL_ERROR|TDFL_SYNCERROR)) == (TDFL_ERROR|TDFL_SYNCERROR))) { if (xact->td_error == -ENOMEM) { return (SCST_TGT_RES_QUEUE_FULL); } else { @@ -1218,12 +1218,12 @@ out: SDprintk2("%s: TMD[%llx] %p hf %x lf %x xfrlen %d totlen %d moved %d\n", __FUNCTION__, tmd->cd_tagval, tmd, xact->td_hflags, xact->td_lflags, xact->td_xfrlen, tmd->cd_totlen, tmd->cd_moved); - up_read(&bc->disable_sem); (*bp->h.r_action)(QIN_TMD_CONT, xact); + up_read(&bc->disable_sem); /* * Did we have an error starting this particular transaction? */ - if (unlikely(xact->td_lflags & (TDFL_ERROR|TDFL_SYNCERROR)) == (TDFL_ERROR|TDFL_SYNCERROR)) { + if (unlikely((xact->td_lflags & (TDFL_ERROR|TDFL_SYNCERROR)) == (TDFL_ERROR|TDFL_SYNCERROR))) { if (xact->td_error == -ENOMEM) { return (SCST_TGT_RES_QUEUE_FULL); } else {