Skip site navigation (1)Skip section navigation (2) 
Date:      Sat, 16 May 2020 23:24:39 +0000 (UTC)
From:      Rick Macklem <rmacklem@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject:   svn commit: r361119 - projects/nfs-over-tls/sys/fs/nfs
Message-ID:  <202005162324.04GNOdXD088375@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
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);

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202005162324.04GNOdXD088375>