Date: Wed, 4 Sep 2019 22:37:28 +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: r351834 - in head/sys/fs: nfs nfsserver Message-ID: <201909042237.x84MbSik037753@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rmacklem Date: Wed Sep 4 22:37:28 2019 New Revision: 351834 URL: https://svnweb.freebsd.org/changeset/base/351834 Log: 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. Modified: head/sys/fs/nfs/nfs_var.h head/sys/fs/nfsserver/nfs_nfsdport.c head/sys/fs/nfsserver/nfs_nfsdstate.c Modified: head/sys/fs/nfs/nfs_var.h ============================================================================== --- head/sys/fs/nfs/nfs_var.h Wed Sep 4 21:53:45 2019 (r351833) +++ head/sys/fs/nfs/nfs_var.h Wed Sep 4 22:37:28 2019 (r351834) @@ -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 *, Modified: head/sys/fs/nfsserver/nfs_nfsdport.c ============================================================================== --- head/sys/fs/nfsserver/nfs_nfsdport.c Wed Sep 4 21:53:45 2019 (r351833) +++ head/sys/fs/nfsserver/nfs_nfsdport.c Wed Sep 4 22:37:28 2019 (r351834) @@ -4448,7 +4448,7 @@ nfsrv_proxyds(struct nfsrv_descript *nd, struct vnode * 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); } Modified: head/sys/fs/nfsserver/nfs_nfsdstate.c ============================================================================== --- head/sys/fs/nfsserver/nfs_nfsdstate.c Wed Sep 4 21:53:45 2019 (r351833) +++ head/sys/fs/nfsserver/nfs_nfsdstate.c Wed Sep 4 22:37:28 2019 (r351834) @@ -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;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201909042237.x84MbSik037753>