d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make the nfsrpc_layoutget() function a static.

Browse Source 
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.
This commit is contained in:
Rick Macklem 2017-09-19 23:28:22 +00:00
parent 1faeac0fd5
commit 0f29b8292d
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sys/fs/nfs/nfs_var.h
View File

@ -479,9 +479,6 @@ int nfsrpc_destroysession(struct nfsmount *, struct nfsclclient *,
struct ucred *, NFSPROC_T *); struct ucred *, NFSPROC_T *);
int nfsrpc_destroyclient(struct nfsmount *, struct nfsclclient *, int nfsrpc_destroyclient(struct nfsmount *, struct nfsclclient *,
struct ucred *, NFSPROC_T *); 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 *, int nfsrpc_getdeviceinfo(struct nfsmount *, uint8_t *, int, uint32_t *,
struct nfscldevinfo **, struct ucred *, NFSPROC_T *); struct nfscldevinfo **, struct ucred *, NFSPROC_T *);
int nfsrpc_layoutcommit(struct nfsmount *, uint8_t *, int, int, int nfsrpc_layoutcommit(struct nfsmount *, uint8_t *, int, int,

5
sys/fs/nfsclient/nfs_clrpcops.c
View File

@ -146,6 +146,9 @@ static int nfsrpc_createlayout(vnode_t, char *, int, struct vattr *,
struct ucred *, NFSPROC_T *, struct nfsvattr *, struct nfsvattr *, struct ucred *, NFSPROC_T *, struct nfsvattr *, struct nfsvattr *,
struct nfsfh **, int *, int *, void *, int *, nfsv4stateid_t *, struct nfsfh **, int *, int *, void *, int *, nfsv4stateid_t *,
int, int, int *, struct nfsclflayouthead *, int *); 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 *, static int nfsrpc_layoutgetres(struct nfsmount *, vnode_t, uint8_t *,
int, nfsv4stateid_t *, int, uint32_t *, struct nfscllayout **, int, nfsv4stateid_t *, int, uint32_t *, struct nfscllayout **,
struct nfsclflayouthead *, int, int *, struct ucred *, NFSPROC_T *); struct nfsclflayouthead *, int, int *, struct ucred *, NFSPROC_T *);
@ -4838,7 +4841,7 @@ nfsrpc_destroyclient(struct nfsmount *nmp, struct nfsclclient *clp,
/* /*
* Do the NFSv4.1 LayoutGet. * Do the NFSv4.1 LayoutGet.
*/ */
int static int
nfsrpc_layoutget(struct nfsmount *nmp, uint8_t *fhp, int fhlen, int iomode, nfsrpc_layoutget(struct nfsmount *nmp, uint8_t *fhp, int fhlen, int iomode,
uint64_t offset, uint64_t len, uint64_t minlen, int layoutlen, uint64_t offset, uint64_t len, uint64_t minlen, int layoutlen,
nfsv4stateid_t *stateidp, int *retonclosep, struct nfsclflayouthead *flhp, nfsv4stateid_t *stateidp, int *retonclosep, struct nfsclflayouthead *flhp,