From owner-svn-src-projects@freebsd.org Sat May 16 23:24:40 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 283552D98F7 for ; Sat, 16 May 2020 23:24:40 +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 49PhFN0JQyz48nf; Sat, 16 May 2020 23:24:40 +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 05A711DBF0; Sat, 16 May 2020 23:24:40 +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 04GNOdSj088377; Sat, 16 May 2020 23:24:39 GMT (envelope-from rmacklem@FreeBSD.org) Received: (from rmacklem@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 04GNOdXD088375; Sat, 16 May 2020 23:24:39 GMT (envelope-from rmacklem@FreeBSD.org) Message-Id: <202005162324.04GNOdXD088375@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rmacklem set sender to rmacklem@FreeBSD.org using -f From: Rick Macklem Date: Sat, 16 May 2020 23:24:39 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r361119 - 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: 361119 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, 16 May 2020 23:24:40 -0000 Author: rmacklem Date: Sat May 16 23:24:39 2020 New Revision: 361119 URL: https://svnweb.freebsd.org/changeset/base/361119 Log: Make nfsm_set() a void function, since the return value is no longer used. Modified: projects/nfs-over-tls/sys/fs/nfs/nfs_commonsubs.c projects/nfs-over-tls/sys/fs/nfs/nfs_var.h Modified: projects/nfs-over-tls/sys/fs/nfs/nfs_commonsubs.c ============================================================================== --- projects/nfs-over-tls/sys/fs/nfs/nfs_commonsubs.c Sat May 16 21:59:41 2020 (r361118) +++ projects/nfs-over-tls/sys/fs/nfs/nfs_commonsubs.c Sat May 16 23:24:39 2020 (r361119) @@ -4872,7 +4872,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. */ -int +void nfsm_set(struct nfsrv_descript *nd, u_int offs) { struct mbuf *m; @@ -4907,17 +4907,14 @@ nfsm_set(struct nfsrv_descript *nd, u_int offs) nd->nd_bpos += pgs->first_pg_off; if (offs > 0) { nd->nd_bpos += offs; - rlen = nd->nd_bextpgsiz = rlen - offs; + nd->nd_bextpgsiz = rlen - offs; } else if (nd->nd_bextpg == 0) - rlen = nd->nd_bextpgsiz = PAGE_SIZE - + nd->nd_bextpgsiz = PAGE_SIZE - pgs->first_pg_off; else - rlen = nd->nd_bextpgsiz = PAGE_SIZE; - } else { + nd->nd_bextpgsiz = PAGE_SIZE; + } else nd->nd_bpos = mtod(m, char *) + offs; - rlen = m->m_len - offs; - } - return (rlen); } /* Modified: projects/nfs-over-tls/sys/fs/nfs/nfs_var.h ============================================================================== --- projects/nfs-over-tls/sys/fs/nfs/nfs_var.h Sat May 16 21:59:41 2020 (r361118) +++ projects/nfs-over-tls/sys/fs/nfs/nfs_var.h Sat May 16 23:24:39 2020 (r361119) @@ -361,7 +361,7 @@ int nfsv4_sequencelookup(struct nfsmount *, struct nfs void nfsv4_freeslot(struct nfsclsession *, int); struct ucred *nfsrv_getgrpscred(struct ucred *); struct nfsdevice *nfsv4_findmirror(struct nfsmount *); -int nfsm_set(struct nfsrv_descript *, u_int); +void nfsm_set(struct nfsrv_descript *, u_int); /* nfs_clcomsubs.c */ void nfsm_uiombuf(struct nfsrv_descript *, struct uio *, int);