Skip site navigation (1)Skip section navigation (2) 
Date:      Thu, 5 Sep 2019 22:25:19 +0000 (UTC)
From:      Rick Macklem <rmacklem@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r351901 - head/sys/fs/nfsserver
Message-ID:  <201909052225.x85MPJ9o004838@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: rmacklem
Date: Thu Sep  5 22:25:19 2019
New Revision: 351901
URL: https://svnweb.freebsd.org/changeset/base/351901

Log:
  Delete the unused "nd" argument for nfsrv_proxyds().
  
  The "nd" argument for nfsrv_proxyds() is no longer used by the function.
  This patch deletes it. This allows a subsequent patch to delete the "nd"
  argument from nfsvno_getattr(), since it's only use of "nd" was to pass it
  to nfsrv_proxyds().
  Getting rid of the "nd" argument from nfsvno_getattr() avoids confusion
  over why it might need "nd".
  
  This patch is trivial and does not have any semantic effect.

Modified:
  head/sys/fs/nfsserver/nfs_nfsdport.c

Modified: head/sys/fs/nfsserver/nfs_nfsdport.c
==============================================================================
--- head/sys/fs/nfsserver/nfs_nfsdport.c	Thu Sep  5 22:15:50 2019	(r351900)
+++ head/sys/fs/nfsserver/nfs_nfsdport.c	Thu Sep  5 22:25:19 2019	(r351901)
@@ -110,9 +110,9 @@ static void nfsrv_pnfsremovesetup(struct vnode *, NFSP
     int *, char *, fhandle_t *);
 static void nfsrv_pnfsremove(struct vnode **, int, char *, fhandle_t *,
     NFSPROC_T *);
-static int nfsrv_proxyds(struct nfsrv_descript *, struct vnode *, off_t, int,
-    struct ucred *, struct thread *, int, struct mbuf **, char *,
-    struct mbuf **, struct nfsvattr *, struct acl *);
+static int nfsrv_proxyds(struct vnode *, off_t, int, struct ucred *,
+    struct thread *, int, struct mbuf **, char *, struct mbuf **,
+    struct nfsvattr *, struct acl *);
 static int nfsrv_setextattr(struct vnode *, struct nfsvattr *, NFSPROC_T *);
 static int nfsrv_readdsrpc(fhandle_t *, off_t, int, struct ucred *,
     NFSPROC_T *, struct nfsmount *, struct mbuf **, struct mbuf **);
@@ -293,7 +293,7 @@ nfsvno_getattr(struct vnode *vp, struct nfsvattr *nvap
 	    NFSISSET_ATTRBIT(attrbitp, NFSATTRBIT_SIZE) ||
 	    NFSISSET_ATTRBIT(attrbitp, NFSATTRBIT_TIMEACCESS) ||
 	    NFSISSET_ATTRBIT(attrbitp, NFSATTRBIT_TIMEMODIFY))) {
-		error = nfsrv_proxyds(nd, vp, 0, 0, nd->nd_cred, p,
+		error = nfsrv_proxyds(vp, 0, 0, nd->nd_cred, p,
 		    NFSPROC_GETATTR, NULL, NULL, NULL, &na, NULL);
 		if (error == 0)
 			gotattr = 1;
@@ -476,7 +476,7 @@ nfsvno_setattr(struct vnode *vp, struct nfsvattr *nvap
 	    nvap->na_vattr.va_atime.tv_sec != VNOVAL ||
 	    nvap->na_vattr.va_mtime.tv_sec != VNOVAL)) {
 		/* For a pNFS server, set the attributes on the DS file. */
-		error = nfsrv_proxyds(NULL, vp, 0, 0, cred, p, NFSPROC_SETATTR,
+		error = nfsrv_proxyds(vp, 0, 0, cred, p, NFSPROC_SETATTR,
 		    NULL, NULL, NULL, nvap, NULL);
 		if (error == ENOENT)
 			error = 0;
@@ -795,7 +795,7 @@ nfsvno_read(struct vnode *vp, off_t off, int cnt, stru
 	 * Attempt to read from a DS file. A return of ENOENT implies
 	 * there is no DS file to read.
 	 */
-	error = nfsrv_proxyds(NULL, vp, off, cnt, cred, p, NFSPROC_READDS, mpp,
+	error = nfsrv_proxyds(vp, off, cnt, cred, p, NFSPROC_READDS, mpp,
 	    NULL, mpendp, NULL, NULL);
 	if (error != ENOENT)
 		return (error);
@@ -891,7 +891,7 @@ nfsvno_write(struct vnode *vp, off_t off, int retlen, 
 	 * Attempt to write to a DS file. A return of ENOENT implies
 	 * there is no DS file to write.
 	 */
-	error = nfsrv_proxyds(NULL, vp, off, retlen, cred, p, NFSPROC_WRITEDS,
+	error = nfsrv_proxyds(vp, off, retlen, cred, p, NFSPROC_WRITEDS,
 	    &mp, cp, NULL, NULL, NULL);
 	if (error != ENOENT) {
 		*stable = NFSWRITE_FILESYNC;
@@ -4377,7 +4377,7 @@ nfsrv_updatemdsattr(struct vnode *vp, struct nfsvattr 
 
 	/* Do this as root so that it won't fail with EACCES. */
 	tcred = newnfs_getcred();
-	error = nfsrv_proxyds(NULL, vp, 0, 0, tcred, p, NFSPROC_LAYOUTRETURN,
+	error = nfsrv_proxyds(vp, 0, 0, tcred, p, NFSPROC_LAYOUTRETURN,
 	    NULL, NULL, NULL, nap, NULL);
 	NFSFREECRED(tcred);
 	return (error);
@@ -4392,15 +4392,15 @@ nfsrv_dssetacl(struct vnode *vp, struct acl *aclp, str
 {
 	int error;
 
-	error = nfsrv_proxyds(NULL, vp, 0, 0, cred, p, NFSPROC_SETACL,
+	error = nfsrv_proxyds(vp, 0, 0, cred, p, NFSPROC_SETACL,
 	    NULL, NULL, NULL, NULL, aclp);
 	return (error);
 }
 
 static int
-nfsrv_proxyds(struct nfsrv_descript *nd, struct vnode *vp, off_t off, int cnt,
-    struct ucred *cred, struct thread *p, int ioproc, struct mbuf **mpp,
-    char *cp, struct mbuf **mpp2, struct nfsvattr *nap, struct acl *aclp)
+nfsrv_proxyds(struct vnode *vp, off_t off, int cnt, struct ucred *cred,
+    struct thread *p, int ioproc, struct mbuf **mpp, char *cp,
+    struct mbuf **mpp2, struct nfsvattr *nap, struct acl *aclp)
 {
 	struct nfsmount *nmp[NFSDEV_MAXMIRRORS], *failnmp;
 	fhandle_t fh[NFSDEV_MAXMIRRORS];

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