From owner-svn-src-projects@freebsd.org Sat Aug 1 02:21:22 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 DB20936A157 for ; Sat, 1 Aug 2020 02:21:22 +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 4BJSZB5SXhz4DHN; Sat, 1 Aug 2020 02:21:22 +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 86106B63A; Sat, 1 Aug 2020 02:21:22 +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 0712LMGG082277; Sat, 1 Aug 2020 02:21:22 GMT (envelope-from rmacklem@FreeBSD.org) Received: (from rmacklem@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0712LLoo082271; Sat, 1 Aug 2020 02:21:21 GMT (envelope-from rmacklem@FreeBSD.org) Message-Id: <202008010221.0712LLoo082271@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rmacklem set sender to rmacklem@FreeBSD.org using -f From: Rick Macklem Date: Sat, 1 Aug 2020 02:21:21 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r363749 - in projects/nfs-over-tls/sys/fs: nfs nfsclient nfsserver X-SVN-Group: projects X-SVN-Commit-Author: rmacklem X-SVN-Commit-Paths: in projects/nfs-over-tls/sys/fs: nfs nfsclient nfsserver X-SVN-Commit-Revision: 363749 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: Sat, 01 Aug 2020 02:21:22 -0000 Author: rmacklem Date: Sat Aug 1 02:21:20 2020 New Revision: 363749 URL: https://svnweb.freebsd.org/changeset/base/363749 Log: Minor cleanups to bring the code closer to what is in head. Modified: projects/nfs-over-tls/sys/fs/nfs/nfs_commonkrpc.c projects/nfs-over-tls/sys/fs/nfs/nfs_commonsubs.c projects/nfs-over-tls/sys/fs/nfsclient/nfs_clkrpc.c projects/nfs-over-tls/sys/fs/nfsclient/nfs_clrpcops.c projects/nfs-over-tls/sys/fs/nfsserver/nfs_nfsdport.c projects/nfs-over-tls/sys/fs/nfsserver/nfs_nfsdserv.c Modified: projects/nfs-over-tls/sys/fs/nfs/nfs_commonkrpc.c ============================================================================== --- projects/nfs-over-tls/sys/fs/nfs/nfs_commonkrpc.c Fri Jul 31 23:35:49 2020 (r363748) +++ projects/nfs-over-tls/sys/fs/nfs/nfs_commonkrpc.c Sat Aug 1 02:21:20 2020 (r363749) @@ -897,7 +897,7 @@ tryagain: */ newnfs_realign(&nd->nd_mrep, M_WAITOK); nd->nd_md = nd->nd_mrep; - nd->nd_dpos = mtod(nd->nd_md, char *); + nd->nd_dpos = mtod(nd->nd_md, caddr_t); nd->nd_repstat = 0; if (nd->nd_procnum != NFSPROC_NULL && nd->nd_procnum != NFSV4PROC_CBNULL) { Modified: projects/nfs-over-tls/sys/fs/nfs/nfs_commonsubs.c ============================================================================== --- projects/nfs-over-tls/sys/fs/nfs/nfs_commonsubs.c Fri Jul 31 23:35:49 2020 (r363748) +++ projects/nfs-over-tls/sys/fs/nfs/nfs_commonsubs.c Sat Aug 1 02:21:20 2020 (r363749) @@ -4845,8 +4845,7 @@ nfsv4_findmirror(struct nfsmount *nmp) } /* - * Fill in the fields of "struct nfsrv_descript" for a new ext_pgs mbuf. - * The build argument is true for build and false for dissect. + * Fill in the fields of "struct nfsrv_descript". */ void nfsm_set(struct nfsrv_descript *nd, u_int offs) Modified: projects/nfs-over-tls/sys/fs/nfsclient/nfs_clkrpc.c ============================================================================== --- projects/nfs-over-tls/sys/fs/nfsclient/nfs_clkrpc.c Fri Jul 31 23:35:49 2020 (r363748) +++ projects/nfs-over-tls/sys/fs/nfsclient/nfs_clkrpc.c Sat Aug 1 02:21:20 2020 (r363749) @@ -93,8 +93,7 @@ printf("cbprogram proc=%d\n", rqst->rq_proc); rqst->rq_args = NULL; newnfs_realign(&nd.nd_mrep, M_WAITOK); nd.nd_md = nd.nd_mrep; -printf("cbreq nd_md=%p\n", nd.nd_md); - nd.nd_dpos = mtod(nd.nd_md, char *); + nd.nd_dpos = mtod(nd.nd_md, caddr_t); nd.nd_nam = svc_getrpccaller(rqst); nd.nd_nam2 = rqst->rq_addr; nd.nd_mreq = NULL; Modified: projects/nfs-over-tls/sys/fs/nfsclient/nfs_clrpcops.c ============================================================================== --- projects/nfs-over-tls/sys/fs/nfsclient/nfs_clrpcops.c Fri Jul 31 23:35:49 2020 (r363748) +++ projects/nfs-over-tls/sys/fs/nfsclient/nfs_clrpcops.c Sat Aug 1 02:21:20 2020 (r363749) @@ -1810,8 +1810,7 @@ nfsrpc_writerpc(vnode_t vp, struct uio *uiop, int *iom while (tsiz > 0) { *attrflagp = 0; len = (tsiz > wsize) ? wsize : tsiz; - nfscl_reqstart(nd, NFSPROC_WRITE, nmp, np->n_fhp->nfh_fh, - np->n_fhp->nfh_len, NULL, NULL, 0, 0, false); + NFSCL_REQSTART(nd, NFSPROC_WRITE, vp); if (nd->nd_flag & ND_NFSV4) { nfsm_stateidtom(nd, stateidp, NFSSTATEID_PUTSTATEID); NFSM_BUILD(tl, u_int32_t *, NFSX_HYPER+2*NFSX_UNSIGNED); @@ -8464,17 +8463,10 @@ nfsrpc_setextattr(vnode_t vp, const char *name, struct int error; struct nfsrv_descript nfsd; struct nfsrv_descript *nd = &nfsd; - struct nfsmount *nmp = VFSTONFS(vp->v_mount); nfsattrbit_t attrbits; - bool use_ext; *attrflagp = 0; - use_ext = false; - if (uiop->uio_resid > MCLBYTES && NFSHASTLS(nmp)) - use_ext = true; - nfscl_reqstart(nd, NFSPROC_SETEXTATTR, nmp, - VTONFS(vp)->n_fhp->nfh_fh, VTONFS(vp)->n_fhp->nfh_len, NULL, - NULL, 0, 0, use_ext); + NFSCL_REQSTART(nd, NFSPROC_SETEXTATTR, vp); if (uiop->uio_resid > nd->nd_maxreq) { /* nd_maxreq is set by NFSCL_REQSTART(). */ m_freem(nd->nd_mreq); Modified: projects/nfs-over-tls/sys/fs/nfsserver/nfs_nfsdport.c ============================================================================== --- projects/nfs-over-tls/sys/fs/nfsserver/nfs_nfsdport.c Fri Jul 31 23:35:49 2020 (r363748) +++ projects/nfs-over-tls/sys/fs/nfsserver/nfs_nfsdport.c Sat Aug 1 02:21:20 2020 (r363749) @@ -52,7 +52,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include FEATURE(nfsd, "NFSv4 server"); @@ -3281,7 +3280,7 @@ nfsd_fhtovp(struct nfsrv_descript *nd, struct nfsrvfh if (!nd->nd_repstat && exp->nes_exflag == 0 && !(nd->nd_flag & ND_NFSV4)) { vput(*vpp); - nd->nd_repstat = NFSERR_ACCES; + nd->nd_repstat = EACCES; } /* @@ -5264,8 +5263,6 @@ nfsrv_writedsdorpc(struct nfsmount *nmp, fhandle_t *fh /* Put data in mbuf chain. */ nd->nd_mb->m_next = m; - if ((m->m_flags & M_EXTPG) != 0) - nd->nd_flag |= ND_EXTPG; /* Set nd_mb and nd_bpos to end of data. */ while (m->m_next != NULL) Modified: projects/nfs-over-tls/sys/fs/nfsserver/nfs_nfsdserv.c ============================================================================== --- projects/nfs-over-tls/sys/fs/nfsserver/nfs_nfsdserv.c Fri Jul 31 23:35:49 2020 (r363748) +++ projects/nfs-over-tls/sys/fs/nfsserver/nfs_nfsdserv.c Sat Aug 1 02:21:20 2020 (r363749) @@ -51,7 +51,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include /* Global vars */ extern u_int32_t newnfs_false, newnfs_true;