aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRick Macklem <rmacklem@FreeBSD.org>2019-09-04 22:37:28 +0000
committerRick Macklem <rmacklem@FreeBSD.org>2019-09-04 22:37:28 +0000
commit2e67077700345641bf8e04705340c5f2136a79a3 (patch)
tree48c34b984f861ad540b34c155a4da763522323d6
parent9a2b7c5fce1c93f3fadc0bd9fd0c157ebff92c5f (diff)
downloadsrc-2e67077700345641bf8e04705340c5f2136a79a3.tar.gz
src-2e67077700345641bf8e04705340c5f2136a79a3.zip
Delete the unused "nd" argument for nfsrv_checkdsattr().
The "nd" argument for nfsrv_checkdsattr() is no longer used by the function. This patch deletes it. This allows subsequent patches to delete the "nd" argument from nfsrv_proxyds(), since it's only use of "nd" was to pass it to nfsrv_checkdsattr(). The same will then be true for nfsvno_getattr(), which passes "nd" 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. Found by inspection while working on the NFSv4.2 server.
Notes
Notes: svn path=/head/; revision=351834
-rw-r--r--sys/fs/nfs/nfs_var.h2
-rw-r--r--sys/fs/nfsserver/nfs_nfsdport.c2
-rw-r--r--sys/fs/nfsserver/nfs_nfsdstate.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/sys/fs/nfs/nfs_var.h b/sys/fs/nfs/nfs_var.h
index b51a7038b97e..ea2af575cfb8 100644
--- a/sys/fs/nfs/nfs_var.h
+++ b/sys/fs/nfs/nfs_var.h
@@ -162,7 +162,7 @@ void nfsrv_freefilelayouts(fhandle_t *);
int nfsrv_deldsserver(int, char *, NFSPROC_T *);
struct nfsdevice *nfsrv_deldsnmp(int, struct nfsmount *, NFSPROC_T *);
int nfsrv_createdevids(struct nfsd_nfsd_args *, NFSPROC_T *);
-int nfsrv_checkdsattr(struct nfsrv_descript *, vnode_t, NFSPROC_T *);
+int nfsrv_checkdsattr(vnode_t, NFSPROC_T *);
int nfsrv_copymr(vnode_t, vnode_t, vnode_t, struct nfsdevice *,
struct pnfsdsfile *, struct pnfsdsfile *, int, struct ucred *, NFSPROC_T *);
int nfsrv_mdscopymr(char *, char *, char *, char *, int *, char *, NFSPROC_T *,
diff --git a/sys/fs/nfsserver/nfs_nfsdport.c b/sys/fs/nfsserver/nfs_nfsdport.c
index bb21711f1a4e..f97bc1056c16 100644
--- a/sys/fs/nfsserver/nfs_nfsdport.c
+++ b/sys/fs/nfsserver/nfs_nfsdport.c
@@ -4448,7 +4448,7 @@ nfsrv_proxyds(struct nfsrv_descript *nd, struct vnode *vp, off_t off, int cnt,
* delegation issued to a client for the file.
*/
if (nfsrv_pnfsgetdsattr == 0 ||
- nfsrv_checkdsattr(nd, vp, p) == 0) {
+ nfsrv_checkdsattr(vp, p) == 0) {
free(buf, M_TEMP);
return (error);
}
diff --git a/sys/fs/nfsserver/nfs_nfsdstate.c b/sys/fs/nfsserver/nfs_nfsdstate.c
index b5a7399685a8..a509eb2bdb91 100644
--- a/sys/fs/nfsserver/nfs_nfsdstate.c
+++ b/sys/fs/nfsserver/nfs_nfsdstate.c
@@ -7999,7 +7999,7 @@ nfsrv_freealldevids(void)
*/
#define NFSCLIDVECSIZE 6
APPLESTATIC int
-nfsrv_checkdsattr(struct nfsrv_descript *nd, vnode_t vp, NFSPROC_T *p)
+nfsrv_checkdsattr(vnode_t vp, NFSPROC_T *p)
{
fhandle_t fh, *tfhp;
struct nfsstate *stp;