Date: Thu, 10 May 2012 22:32:33 +0000 (UTC) From: Kip Macy <kmacy@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r235248 - projects/iscsi_opt/sys/dev/iscsi/initiator Message-ID: <201205102232.q4AMWXZ2054590@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kmacy Date: Thu May 10 22:32:33 2012 New Revision: 235248 URL: http://svn.freebsd.org/changeset/base/235248 Log: don't overwrite RELEASE_SIMQ from status Modified: projects/iscsi_opt/sys/dev/iscsi/initiator/iscsi_subr.c Modified: projects/iscsi_opt/sys/dev/iscsi/initiator/iscsi_subr.c ============================================================================== --- projects/iscsi_opt/sys/dev/iscsi/initiator/iscsi_subr.c Thu May 10 22:00:38 2012 (r235247) +++ projects/iscsi_opt/sys/dev/iscsi/initiator/iscsi_subr.c Thu May 10 22:32:33 2012 (r235248) @@ -232,7 +232,7 @@ _scsi_done(isc_session_t *sp, u_int resp case 0x18: // Reservation Conflict case 0x28: // Task Set Full - ccb_h->status = CAM_REQUEUE_REQ; + ccb_h->status |= CAM_REQUEUE_REQ; break; default: //case 0x22: // Command Terminated @@ -270,9 +270,10 @@ iscsi_requeue(isc_session_t *sp) while((pq = i_dqueue_hld(sp)) != NULL) { i++; if(pq->ccb != NULL) { + pq->ccb->ccb_h.status = 0; if (sp->cam_flags & ISC_QFROZEN) { sp->space_needed = 0; - pq->ccb->ccb_h.status |= CAM_RELEASE_SIMQ; + pq->ccb->ccb_h.status = CAM_RELEASE_SIMQ; sp->cam_flags &= ~ISC_QFROZEN; } _scsi_done(sp, 0, 0x28, pq->ccb, NULL);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201205102232.q4AMWXZ2054590>