From owner-svn-src-projects@freebsd.org Fri May 1 01:30:11 2020 Return-Path: Delivered-To: svn-src-projects@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 DEE3C2CDF74 for ; Fri, 1 May 2020 01:30:11 +0000 (UTC) (envelope-from rmacklem@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 49Cvnb5QJ9z4JQG; Fri, 1 May 2020 01:30:11 +0000 (UTC) (envelope-from rmacklem@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 B0B3022A; Fri, 1 May 2020 01:30:11 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0411UBJs047583; Fri, 1 May 2020 01:30:11 GMT (envelope-from rmacklem@FreeBSD.org) Received: (from rmacklem@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0411UBVp047582; Fri, 1 May 2020 01:30:11 GMT (envelope-from rmacklem@FreeBSD.org) Message-Id: <202005010130.0411UBVp047582@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rmacklem set sender to rmacklem@FreeBSD.org using -f From: Rick Macklem Date: Fri, 1 May 2020 01:30:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r360518 - projects/nfs-over-tls/sys/fs/nfs X-SVN-Group: projects X-SVN-Commit-Author: rmacklem X-SVN-Commit-Paths: projects/nfs-over-tls/sys/fs/nfs X-SVN-Commit-Revision: 360518 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 01 May 2020 01:30:11 -0000 Author: rmacklem Date: Fri May 1 01:30:11 2020 New Revision: 360518 URL: https://svnweb.freebsd.org/changeset/base/360518 Log: Modify nfsm_copyfrommbuf() so that it calls nfsm_copfrommbuf_extpgs() for the ext_pgs mbuf case. This small change simplifies the callers and minimizes the changes required to integrate ext_pgs mbuf handling into the code in head. Modified: projects/nfs-over-tls/sys/fs/nfs/nfs_commonsubs.c Modified: projects/nfs-over-tls/sys/fs/nfs/nfs_commonsubs.c ============================================================================== --- projects/nfs-over-tls/sys/fs/nfs/nfs_commonsubs.c Fri May 1 01:26:36 2020 (r360517) +++ projects/nfs-over-tls/sys/fs/nfs/nfs_commonsubs.c Fri May 1 01:30:11 2020 (r360518) @@ -656,12 +656,8 @@ nfsm_mbufuio(struct nfsrv_descript *nd, struct uio *ui left = siz; uiosiz = left; while (left > 0) { - if ((nd->nd_md->m_flags & M_NOMAP) != 0) - xfer = nfsm_copyfrommbuf_extpgs(nd, uiocp, - uiop->uio_segflg, left); - else - xfer = nfsm_copyfrommbuf(nd, uiocp, - uiop->uio_segflg, left); + xfer = nfsm_copyfrommbuf(nd, uiocp, uiop->uio_segflg, + left); left -= xfer; uiocp += xfer; uiop->uio_offset += xfer; @@ -771,12 +767,7 @@ nfsm_dissct(struct nfsrv_descript *nd, int siz, int ho if (nd->nd_md == NULL) return (NULL); nfsm_set(nd, 0, false); - if ((nd->nd_md->m_flags & M_NOMAP) != 0) - xfer = nfsm_copyfrommbuf_extpgs(nd, p, - UIO_SYSSPACE, siz2); - else - xfer = nfsm_copyfrommbuf(nd, p, - UIO_SYSSPACE, siz2); + xfer = nfsm_copyfrommbuf(nd, p, UIO_SYSSPACE, siz2); p += xfer; siz2 -= xfer; if (siz2 > 0) @@ -2479,12 +2470,7 @@ nfsrv_mtostr(struct nfsrv_descript *nd, char *str, int rem = NFSM_RNDUP(siz) - siz; while (siz > 0) { - if ((nd->nd_md->m_flags & M_NOMAP) != 0) - xfer = nfsm_copyfrommbuf_extpgs(nd, str, - UIO_SYSSPACE, siz); - else - xfer = nfsm_copyfrommbuf(nd, str, - UIO_SYSSPACE, siz); + xfer = nfsm_copyfrommbuf(nd, str, UIO_SYSSPACE, siz); str += xfer; siz -= xfer; if (siz > 0 && !nfsm_shiftnext(nd, &xfer)) { @@ -4972,6 +4958,10 @@ nfsm_copyfrommbuf(struct nfsrv_descript *nd, char *cp, int xfer; m = nd->nd_md; + if ((m->m_flags & M_NOMAP) != 0) { + xfer = nfsm_copyfrommbuf_extpgs(nd, cp, segflg, len); + return (xfer); + } xfer = mtod(m, char *) + m->m_len - nd->nd_dpos; xfer = min(xfer, len); if (xfer > 0) {