svn commit: r323783 - in head/sys/fs: nfs nfsclient

[Rick Macklem]

Author: rmacklem
Date: Tue Sep 19 23:28:22 2017
New Revision: 323783
URL: https://svnweb.freebsd.org/changeset/base/323783

Log:
  Make the nfsrpc_layoutget() function a static.
  
  Make the NFSv4 pNFS client function nfsrpc_layoutget() a static, since it
  is only used in sys/fs/nfsclient/nfs_clrpcops.c.
  This prepares the code for future patches that add Flex File layout
  support.

Modified:
  head/sys/fs/nfs/nfs_var.h
  head/sys/fs/nfsclient/nfs_clrpcops.c

Modified: head/sys/fs/nfs/nfs_var.h
==============================================================================
--- head/sys/fs/nfs/nfs_var.h	Tue Sep 19 23:26:27 2017	(r323782)
+++ head/sys/fs/nfs/nfs_var.h	Tue Sep 19 23:28:22 2017	(r323783)
@@ -479,9 +479,6 @@ int nfsrpc_destroysession(struct nfsmount *, struct nf
     struct ucred *, NFSPROC_T *);
 int nfsrpc_destroyclient(struct nfsmount *, struct nfsclclient *,
     struct ucred *, NFSPROC_T *);
-int nfsrpc_layoutget(struct nfsmount *, uint8_t *, int, int, uint64_t, uint64_t,
-    uint64_t, int, nfsv4stateid_t *, int *, struct nfsclflayouthead *,
-    struct ucred *, NFSPROC_T *, void *);
 int nfsrpc_getdeviceinfo(struct nfsmount *, uint8_t *, int, uint32_t *,
     struct nfscldevinfo **, struct ucred *, NFSPROC_T *);
 int nfsrpc_layoutcommit(struct nfsmount *, uint8_t *, int, int,

Modified: head/sys/fs/nfsclient/nfs_clrpcops.c
==============================================================================
--- head/sys/fs/nfsclient/nfs_clrpcops.c	Tue Sep 19 23:26:27 2017	(r323782)
+++ head/sys/fs/nfsclient/nfs_clrpcops.c	Tue Sep 19 23:28:22 2017	(r323783)
@@ -146,6 +146,9 @@ static int nfsrpc_createlayout(vnode_t, char *, int, s
     struct ucred *, NFSPROC_T *, struct nfsvattr *, struct nfsvattr *,
     struct nfsfh **, int *, int *, void *, int *, nfsv4stateid_t *,
     int, int, int *, struct nfsclflayouthead *, int *);
+static int nfsrpc_layoutget(struct nfsmount *, uint8_t *, int, int, uint64_t,
+    uint64_t, uint64_t, int, nfsv4stateid_t *, int *, struct nfsclflayouthead *,
+    struct ucred *, NFSPROC_T *, void *);
 static int nfsrpc_layoutgetres(struct nfsmount *, vnode_t, uint8_t *,
     int, nfsv4stateid_t *, int, uint32_t *, struct nfscllayout **,
     struct nfsclflayouthead *, int, int *, struct ucred *, NFSPROC_T *);
@@ -4838,7 +4841,7 @@ nfsrpc_destroyclient(struct nfsmount *nmp, struct nfsc
 /*
  * Do the NFSv4.1 LayoutGet.
  */
-int
+static int
 nfsrpc_layoutget(struct nfsmount *nmp, uint8_t *fhp, int fhlen, int iomode,
     uint64_t offset, uint64_t len, uint64_t minlen, int layoutlen,
     nfsv4stateid_t *stateidp, int *retonclosep, struct nfsclflayouthead *flhp,