From owner-svn-src-all@freebsd.org Sun Mar 1 18:56:00 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 4FCB2249B2D; Sun, 1 Mar 2020 18:56:00 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48VstS0Qsjz3QbG; Sun, 1 Mar 2020 18:56:00 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id F21BA8156; Sun, 1 Mar 2020 18:55:59 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 021ItxE6034959; Sun, 1 Mar 2020 18:55:59 GMT (envelope-from delphij@FreeBSD.org) Received: (from delphij@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 021Itxvd034957; Sun, 1 Mar 2020 18:55:59 GMT (envelope-from delphij@FreeBSD.org) Message-Id: <202003011855.021Itxvd034957@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: delphij set sender to delphij@FreeBSD.org using -f From: Xin LI Date: Sun, 1 Mar 2020 18:55:59 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r358496 - head/sys/dev/iscsi_initiator X-SVN-Group: head X-SVN-Commit-Author: delphij X-SVN-Commit-Paths: head/sys/dev/iscsi_initiator X-SVN-Commit-Revision: 358496 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 01 Mar 2020 18:56:00 -0000 Author: delphij Date: Sun Mar 1 18:55:59 2020 New Revision: 358496 URL: https://svnweb.freebsd.org/changeset/base/358496 Log: Fix build. Modified: head/sys/dev/iscsi_initiator/isc_sm.c head/sys/dev/iscsi_initiator/iscsi_subr.c Modified: head/sys/dev/iscsi_initiator/isc_sm.c ============================================================================== --- head/sys/dev/iscsi_initiator/isc_sm.c Sun Mar 1 18:18:11 2020 (r358495) +++ head/sys/dev/iscsi_initiator/isc_sm.c Sun Mar 1 18:55:59 2020 (r358496) @@ -514,7 +514,7 @@ proc_out(isc_session_t *sp) if(pq->ccb) { xdebug("back to cam"); pq->ccb->ccb_h.status |= CAM_REQUEUE_REQ; // some better error? - xpt_done(sp, pq->ccb); + xpt_done(pq->ccb); pdu_free(sp->isc, pq); } else @@ -747,4 +747,4 @@ ism_start(isc_session_t *sp) debug(4, "starting ism_proc: sp->sid=%d", sp->sid); return kproc_create(ism_out, sp, &sp->stp, 0, 0, "isc_out %d", sp->sid); -a} +} Modified: head/sys/dev/iscsi_initiator/iscsi_subr.c ============================================================================== --- head/sys/dev/iscsi_initiator/iscsi_subr.c Sun Mar 1 18:18:11 2020 (r358495) +++ head/sys/dev/iscsi_initiator/iscsi_subr.c Sun Mar 1 18:55:59 2020 (r358496) @@ -248,7 +248,7 @@ _scsi_done(isc_session_t *sp, u_int response, u_int st } sdebug(5, "ccb_h->status=%x", ccb_h->status); - xpt_done(sp, ccb); + xpt_done(ccb); } /* @@ -408,7 +408,7 @@ iscsi_reject(isc_session_t *sp, pduq_t *opq, pduq_t *p debug_called(8); //XXX: check RFC 10.17.1 (page 176) ccb->ccb_h.status = CAM_REQ_ABORTED; - xpt_done(sp, ccb); + xpt_done(ccb); pdu_free(sp->isc, opq); }