From owner-svn-src-projects@freebsd.org Mon Jul 27 01:51:34 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 92656373707 for ; Mon, 27 Jul 2020 01:51:34 +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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 4BFN863RpJz4KjP; Mon, 27 Jul 2020 01:51:34 +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 59CE816548; Mon, 27 Jul 2020 01:51:34 +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 06R1pY14010676; Mon, 27 Jul 2020 01:51:34 GMT (envelope-from rmacklem@FreeBSD.org) Received: (from rmacklem@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 06R1pX0j010674; Mon, 27 Jul 2020 01:51:33 GMT (envelope-from rmacklem@FreeBSD.org) Message-Id: <202007270151.06R1pX0j010674@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rmacklem set sender to rmacklem@FreeBSD.org using -f From: Rick Macklem Date: Mon, 27 Jul 2020 01:51:33 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r363593 - in projects/nfs-over-tls/sys/fs: nfs nfsserver X-SVN-Group: projects X-SVN-Commit-Author: rmacklem X-SVN-Commit-Paths: in projects/nfs-over-tls/sys/fs: nfs nfsserver X-SVN-Commit-Revision: 363593 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.33 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: Mon, 27 Jul 2020 01:51:34 -0000 Author: rmacklem Date: Mon Jul 27 01:51:33 2020 New Revision: 363593 URL: https://svnweb.freebsd.org/changeset/base/363593 Log: Move nfsm_trimtrailing() into nfs_nfsdport.c, since that is the only place it is used. Modified: projects/nfs-over-tls/sys/fs/nfs/nfs_var.h projects/nfs-over-tls/sys/fs/nfsserver/nfs_nfsdport.c projects/nfs-over-tls/sys/fs/nfsserver/nfs_nfsdsubs.c Modified: projects/nfs-over-tls/sys/fs/nfs/nfs_var.h ============================================================================== --- projects/nfs-over-tls/sys/fs/nfs/nfs_var.h Mon Jul 27 01:38:14 2020 (r363592) +++ projects/nfs-over-tls/sys/fs/nfs/nfs_var.h Mon Jul 27 01:51:33 2020 (r363593) @@ -410,8 +410,6 @@ void nfsd_init(void); int nfsd_checkrootexp(struct nfsrv_descript *); void nfsd_getminorvers(struct nfsrv_descript *, u_char *, u_char **, int *, u_int32_t *); -void nfsm_trimtrailing(struct nfsrv_descript *, struct mbuf *, - caddr_t, int, int); /* nfs_clvfsops.c */ void nfscl_retopts(struct nfsmount *, char *, size_t); Modified: projects/nfs-over-tls/sys/fs/nfsserver/nfs_nfsdport.c ============================================================================== --- projects/nfs-over-tls/sys/fs/nfsserver/nfs_nfsdport.c Mon Jul 27 01:38:14 2020 (r363592) +++ projects/nfs-over-tls/sys/fs/nfsserver/nfs_nfsdport.c Mon Jul 27 01:51:33 2020 (r363593) @@ -147,6 +147,8 @@ static int nfsrv_dsremove(struct vnode *, char *, stru static int nfsrv_dssetacl(struct vnode *, struct acl *, struct ucred *, NFSPROC_T *); static int nfsrv_pnfsstatfs(struct statfs *, struct mount *); +static void nfsm_trimtrailing(struct nfsrv_descript *, struct mbuf *, + char *, int, int); int nfs_pnfsio(task_fn_t *, void *); @@ -6550,6 +6552,44 @@ out: } NFSEXITCODE(error); return (error); +} + +/* + * Trim trailing data off the mbuf list being built. + */ +static void +nfsm_trimtrailing(struct nfsrv_descript *nd, struct mbuf *mb, char *bpos, + int bextpg, int bextpgsiz) +{ + vm_page_t pg; + int fullpgsiz, i; + + if (mb->m_next != NULL) { + m_freem(mb->m_next); + mb->m_next = NULL; + } + if ((mb->m_flags & M_EXTPG) != 0) { + /* First, get rid of any pages after this position. */ + for (i = mb->m_epg_npgs - 1; i > bextpg; i--) { + pg = PHYS_TO_VM_PAGE(mb->m_epg_pa[i]); + vm_page_unwire_noq(pg); + vm_page_free(pg); + } + mb->m_epg_npgs = bextpg + 1; + if (bextpg == 0) + fullpgsiz = PAGE_SIZE - mb->m_epg_1st_off; + else + fullpgsiz = PAGE_SIZE; + mb->m_epg_last_len = fullpgsiz - bextpgsiz; + mb->m_len = m_epg_pagelen(mb, 0, mb->m_epg_1st_off); + for (i = 1; i < mb->m_epg_npgs; i++) + mb->m_len += m_epg_pagelen(mb, i, 0); + nd->nd_bextpgsiz = bextpgsiz; + nd->nd_bextpg = bextpg; + } else + mb->m_len = bpos - mtod(mb, char *); + nd->nd_mb = mb; + nd->nd_bpos = bpos; } extern int (*nfsd_call_nfsd)(struct thread *, struct nfssvc_args *); Modified: projects/nfs-over-tls/sys/fs/nfsserver/nfs_nfsdsubs.c ============================================================================== --- projects/nfs-over-tls/sys/fs/nfsserver/nfs_nfsdsubs.c Mon Jul 27 01:38:14 2020 (r363592) +++ projects/nfs-over-tls/sys/fs/nfsserver/nfs_nfsdsubs.c Mon Jul 27 01:51:33 2020 (r363593) @@ -2181,41 +2181,3 @@ nfsmout: *taglenp = taglen; } -/* - * Trim trailing data off the mbuf list being built. - */ -void -nfsm_trimtrailing(struct nfsrv_descript *nd, struct mbuf *mb, char *bpos, - int bextpg, int bextpgsiz) -{ - vm_page_t pg; - int fullpgsiz, i; - - if (mb->m_next != NULL) { - m_freem(mb->m_next); - mb->m_next = NULL; - } - if ((mb->m_flags & M_EXTPG) != 0) { - /* First, get rid of any pages after this position. */ - for (i = mb->m_epg_npgs - 1; i > bextpg; i--) { - pg = PHYS_TO_VM_PAGE(mb->m_epg_pa[i]); - vm_page_unwire_noq(pg); - vm_page_free(pg); - } - mb->m_epg_npgs = bextpg + 1; - if (bextpg == 0) - fullpgsiz = PAGE_SIZE - mb->m_epg_1st_off; - else - fullpgsiz = PAGE_SIZE; - mb->m_epg_last_len = fullpgsiz - bextpgsiz; - mb->m_len = m_epg_pagelen(mb, 0, mb->m_epg_1st_off); - for (i = 1; i < mb->m_epg_npgs; i++) - mb->m_len += m_epg_pagelen(mb, i, 0); - nd->nd_bextpgsiz = bextpgsiz; - nd->nd_bextpg = bextpg; - } else - mb->m_len = bpos - mtod(mb, char *); - nd->nd_mb = mb; - nd->nd_bpos = bpos; -} -