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

nfs: Remove APPLESTATIC macro

Browse Source 
It is no longer useful.

Reviewed by:	rmacklem
Approved by:	mav (mentor)
MFC after:	1 week
Sponsored by:	iXsystems, Inc.
Differential Revision:	https://reviews.freebsd.org/D24811
This commit is contained in:
freqlabs 2020-05-12 13:23:25 +00:00
parent 21d11e288e
commit 9b20c9bd79
12 changed files with 247 additions and 252 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/fs/nfs/nfs_commonacl.c
View File

@ -40,7 +40,7 @@ static int nfsrv_acemasktoperm(u_int32_t acetype, u_int32_t mask, int owner,
/*
* Handle xdr for an ace.
*/
APPLESTATIC int
int
nfsrv_dissectace(struct nfsrv_descript *nd, struct acl_entry *acep,
int *aceerrp, int *acesizep, NFSPROC_T *p)
{
@ -388,7 +388,7 @@ nfsrv_buildace(struct nfsrv_descript *nd, u_char *name, int namelen,
/*
* Build an NFSv4 ACL.
*/
APPLESTATIC int
int
nfsrv_buildacl(struct nfsrv_descript *nd, NFSACL_T *aclp, enum vtype type,
NFSPROC_T *p)
{
@ -451,7 +451,7 @@ nfsrv_buildacl(struct nfsrv_descript *nd, NFSACL_T *aclp, enum vtype type,
* Compare two NFSv4 acls.
* Return 0 if they are the same, 1 if not the same.
*/
APPLESTATIC int
int
nfsrv_compareacl(NFSACL_T *aclp1, NFSACL_T *aclp2)
{
int i;

72
sys/fs/nfs/nfs_commonsubs.c
View File

@ -314,7 +314,7 @@ static int nfs_bigrequest[NFSV42_NPROCS] = {
* Start building a request. Mostly just put the first file handle in
* place.
*/
APPLESTATIC void
void
nfscl_reqstart(struct nfsrv_descript *nd, int procnum, struct nfsmount *nmp,
u_int8_t *nfhp, int fhlen, u_int32_t **opcntpp, struct nfsclsession *sep,
int vers, int minorvers)
@ -453,7 +453,7 @@ nfscl_reqstart(struct nfsrv_descript *nd, int procnum, struct nfsmount *nmp,
/*
* Put a state Id in the mbuf list.
*/
APPLESTATIC void
void
nfsm_stateidtom(struct nfsrv_descript *nd, nfsv4stateid_t *stateidp, int flag)
{
nfsv4stateid_t *st;
@ -689,7 +689,7 @@ nfsm_mbufuio(struct nfsrv_descript *nd, struct uio *uiop, int siz)
* This is used by the macro NFSM_DISSECT for tough
* cases.
*/
APPLESTATIC void *
void *
nfsm_dissct(struct nfsrv_descript *nd, int siz, int how)
{
struct mbuf *mp2;
@ -755,7 +755,7 @@ nfsm_dissct(struct nfsrv_descript *nd, int siz, int how)
* here than check for offs > 0 for all calls to nfsm_advance.
* If left == -1, it should be calculated here.
*/
APPLESTATIC int
int
nfsm_advance(struct nfsrv_descript *nd, int offs, int left)
{
int error = 0;
@ -803,7 +803,7 @@ nfsm_advance(struct nfsrv_descript *nd, int offs, int left)
* Copy a string into mbuf(s).
* Return the number of bytes output, including XDR overheads.
*/
APPLESTATIC int
int
nfsm_strtom(struct nfsrv_descript *nd, const char *cp, int siz)
{
struct mbuf *m2;
@ -860,7 +860,7 @@ nfsm_strtom(struct nfsrv_descript *nd, const char *cp, int siz)
/*
* Called once to initialize data structures...
*/
APPLESTATIC void
void
newnfs_init(void)
{
static int nfs_inited = 0;
@ -890,7 +890,7 @@ newnfs_init(void)
* set_true == 1 if there should be an newnfs_true prepended on the file handle.
* Return the number of bytes output, including XDR overhead.
*/
APPLESTATIC int
int
nfsm_fhtom(struct nfsrv_descript *nd, u_int8_t *fhp, int size, int set_true)
{
u_int32_t *tl;
@ -933,7 +933,7 @@ nfsm_fhtom(struct nfsrv_descript *nd, u_int8_t *fhp, int size, int set_true)
* The AF_INET family is handled as a special case so that address mbufs
* don't need to be saved to store "struct in_addr", which is only 4 bytes.
*/
APPLESTATIC int
int
nfsaddr_match(int family, union nethostaddr *haddr, NFSSOCKADDR_T nam)
{
#ifdef INET
@ -970,7 +970,7 @@ nfsaddr_match(int family, union nethostaddr *haddr, NFSSOCKADDR_T nam)
/*
* Similar to the above, but takes to NFSSOCKADDR_T args.
*/
APPLESTATIC int
int
nfsaddr2_match(NFSSOCKADDR_T nam1, NFSSOCKADDR_T nam2)
{
struct sockaddr_in *addr1, *addr2;
@ -1007,7 +1007,7 @@ nfsaddr2_match(NFSSOCKADDR_T nam1, NFSSOCKADDR_T nam2)
/*
* Trim trailing data off the mbuf list being built.
*/
APPLESTATIC void
void
newnfs_trimtrailing(nd, mb, bpos)
struct nfsrv_descript *nd;
struct mbuf *mb;
@ -1026,7 +1026,7 @@ newnfs_trimtrailing(nd, mb, bpos)
/*
* Dissect a file handle on the client.
*/
APPLESTATIC int
int
nfsm_getfh(struct nfsrv_descript *nd, struct nfsfh **nfhpp)
{
u_int32_t *tl;
@ -1061,7 +1061,7 @@ nfsm_getfh(struct nfsrv_descript *nd, struct nfsfh **nfhpp)
* Break down the nfsv4 acl.
* If the aclp == NULL or won't fit in an acl, just discard the acl info.
*/
APPLESTATIC int
int
nfsrv_dissectacl(struct nfsrv_descript *nd, NFSACL_T *aclp, int *aclerrp,
int *aclsizep, __unused NFSPROC_T *p)
{
@ -1127,7 +1127,7 @@ nfsrv_skipace(struct nfsrv_descript *nd, int *acesizep)
* Returns EBADRPC for a parsing error, 0 otherwise.
* If the clearinvalid flag is set, clear the bits not supported.
*/
APPLESTATIC int
int
nfsrv_getattrbits(struct nfsrv_descript *nd, nfsattrbit_t *attrbitp, int *cntp,
int *retnotsupp)
{
@ -1173,7 +1173,7 @@ nfsrv_getattrbits(struct nfsrv_descript *nd, nfsattrbit_t *attrbitp, int *cntp,
* and 0 otherwise.
* Returns EBADRPC if it can't be parsed, 0 otherwise.
*/
APPLESTATIC int
int
nfsv4_loadattr(struct nfsrv_descript *nd, vnode_t vp,
struct nfsvattr *nap, struct nfsfh **nfhpp, fhandle_t *fhp, int fhsize,
struct nfsv3_pathconf *pc, struct statfs *sbp, struct nfsstatfs *sfp,
@ -2217,7 +2217,7 @@ nfsv4_loadattr(struct nfsrv_descript *nd, vnode_t vp,
* and the mp argument indicates to check for a forced dismount, iff not
* NULL.
*/
APPLESTATIC int
int
nfsv4_lock(struct nfsv4lock *lp, int iwantlock, int *isleptp,
void *mutex, struct mount *mp)
{
@ -2264,7 +2264,7 @@ nfsv4_lock(struct nfsv4lock *lp, int iwantlock, int *isleptp,
* The second argument is set to 1 to indicate the nfslock_usecnt should be
* incremented, as well.
*/
APPLESTATIC void
void
nfsv4_unlock(struct nfsv4lock *lp, int incref)
{
@ -2277,7 +2277,7 @@ nfsv4_unlock(struct nfsv4lock *lp, int incref)
/*
* Release a reference cnt.
*/
APPLESTATIC void
void
nfsv4_relref(struct nfsv4lock *lp)
{
@ -2297,7 +2297,7 @@ nfsv4_relref(struct nfsv4lock *lp)
* If the mp argument is not NULL, check for NFSCL_FORCEDISM() being set and
* return without getting a refcnt for that case.
*/
APPLESTATIC void
void
nfsv4_getref(struct nfsv4lock *lp, int *isleptp, void *mutex,
struct mount *mp)
{
@ -2327,7 +2327,7 @@ nfsv4_getref(struct nfsv4lock *lp, int *isleptp, void *mutex,
* Get a reference as above, but return failure instead of sleeping if
* an exclusive lock is held.
*/
APPLESTATIC int
int
nfsv4_getref_nonblock(struct nfsv4lock *lp)
{
@ -2341,7 +2341,7 @@ nfsv4_getref_nonblock(struct nfsv4lock *lp)
/*
* Test for a lock. Return 1 if locked, 0 otherwise.
*/
APPLESTATIC int
int
nfsv4_testlock(struct nfsv4lock *lp)
{
@ -2369,7 +2369,7 @@ nfsv4_wanted(struct nfsv4lock *lp)
* Return EBADRPC if there is an mbuf error,
* 0 otherwise.
*/
APPLESTATIC int
int
nfsrv_mtostr(struct nfsrv_descript *nd, char *str, int siz)
{
char *cp;
@ -2420,7 +2420,7 @@ nfsrv_mtostr(struct nfsrv_descript *nd, char *str, int siz)
/*
* Fill in the attributes as marked by the bitmap (V4).
*/
APPLESTATIC int
int
nfsv4_fillattr(struct nfsrv_descript *nd, struct mount *mp, vnode_t vp,
NFSACL_T *saclp, struct vattr *vap, fhandle_t *fhp, int rderror,
nfsattrbit_t *attrbitp, struct ucred *cred, NFSPROC_T *p, int isdgram,
@ -3000,7 +3000,7 @@ nfsv4_fillattr(struct nfsrv_descript *nd, struct mount *mp, vnode_t vp,
* Put the attribute bits onto an mbuf list.
* Return the number of bytes of output generated.
*/
APPLESTATIC int
int
nfsrv_putattrbit(struct nfsrv_descript *nd, nfsattrbit_t *attrbitp)
{
u_int32_t *tl;
@ -3025,7 +3025,7 @@ nfsrv_putattrbit(struct nfsrv_descript *nd, nfsattrbit_t *attrbitp)
* (malloc a larger one, as required)
* retlenp - pointer to length to be returned
*/
APPLESTATIC void
void
nfsv4_uidtostr(uid_t uid, u_char **cpp, int *retlenp)
{
int i;
@ -3182,7 +3182,7 @@ nfsrv_getgrpscred(struct ucred *oldcred)
* string is made up entirely of digits, just convert the string to
* a number.
*/
APPLESTATIC int
int
nfsv4_strtouid(struct nfsrv_descript *nd, u_char *str, int len, uid_t *uidp)
{
int i;
@ -3284,7 +3284,7 @@ nfsv4_strtouid(struct nfsrv_descript *nd, u_char *str, int len, uid_t *uidp)
* (malloc a larger one, as required)
* retlenp - pointer to length to be returned
*/
APPLESTATIC void
void
nfsv4_gidtostr(gid_t gid, u_char **cpp, int *retlenp)
{
int i;
@ -3396,7 +3396,7 @@ nfsv4_gidtostr(gid_t gid, u_char **cpp, int *retlenp)
* string is made up entirely of digits, just convert the string to
* a number.
*/
APPLESTATIC int
int
nfsv4_strtogid(struct nfsrv_descript *nd, u_char *str, int len, gid_t *gidp)
{
int i;
@ -3521,7 +3521,7 @@ nfsrv_cmpmixedcase(u_char *cp, u_char *cp2, int len)
/*
* Set the port for the nfsuserd.
*/
APPLESTATIC int
int
nfsrv_nfsuserdport(struct nfsuserd_args *nargs, NFSPROC_T *p)
{
struct nfssockreq *rp;
@ -3604,7 +3604,7 @@ nfsrv_nfsuserdport(struct nfsuserd_args *nargs, NFSPROC_T *p)
/*
* Delete the nfsuserd port.
*/
APPLESTATIC void
void
nfsrv_nfsuserddelport(void)
{
@ -3691,7 +3691,7 @@ nfsrv_getuser(int procnum, uid_t uid, gid_t gid, char *name)
* This function is called from the nfssvc(2) system call, to update the
* kernel user/group name list(s) for the V4 owner and ownergroup attributes.
*/
APPLESTATIC int
int
nfssvc_idname(struct nfsd_idargs *nidp)
{
struct nfsusrgrp *nusrp, *usrp, *newusrp;
@ -4084,7 +4084,7 @@ nfsrv_removeuser(struct nfsusrgrp *usrp, int isuser)
* running, since it doesn't do any locking.
* This function is meant to be used when the nfscommon module is unloaded.
*/
APPLESTATIC void
void
nfsrv_cleanusergroup(void)
{
struct nfsrv_lughash *hp, *hp2;
@ -4131,7 +4131,7 @@ nfsrv_cleanusergroup(void)
* This function scans a byte string and checks for UTF-8 compliance.
* It returns 0 if it conforms and NFSERR_INVAL if not.
*/
APPLESTATIC int
int
nfsrv_checkutf8(u_int8_t *cp, int len)
{
u_int32_t val = 0x0;
@ -4384,7 +4384,7 @@ nfsrv_refstrbigenough(int siz, u_char **cpp, u_char **cpp2, int *slenp)
/*
* Initialize the reply header data structures.
*/
APPLESTATIC void
void
nfsrvd_rephead(struct nfsrv_descript *nd)
{
struct mbuf *mreq;
@ -4449,7 +4449,7 @@ newnfs_sndunlock(int *flagp)
NFSUNLOCKSOCK();
}
APPLESTATIC int
int
nfsv4_getipaddr(struct nfsrv_descript *nd, struct sockaddr_in *sin,
struct sockaddr_in6 *sin6, sa_family_t *saf, int *isudp)
{
@ -4630,7 +4630,7 @@ nfsv4_seqsess_cacherep(uint32_t slotid, struct nfsslot *slots, int repstat,
/*
* Generate the xdr for an NFSv4.1 Sequence Operation.
*/
APPLESTATIC void
void
nfsv4_setsequence(struct nfsmount *nmp, struct nfsrv_descript *nd,
struct nfsclsession *sep, int dont_replycache)
{
@ -4738,7 +4738,7 @@ nfsv4_sequencelookup(struct nfsmount *nmp, struct nfsclsession *sep,
/*
* Free a session slot.
*/
APPLESTATIC void
void
nfsv4_freeslot(struct nfsclsession *sep, int slot)
{
uint64_t bitval;

5
sys/fs/nfs/nfsport.h
View File

@ -103,11 +103,6 @@
#include <rpc/rpc.h>
#include <rpc/rpcsec_gss.h>
/*
* For Darwin, these functions should be "static" when built in a kext.
* (This is always defined as nil otherwise.)
*/
#define APPLESTATIC
#include <ufs/ufs/dir.h>
#include <ufs/ufs/quota.h>
#include <ufs/ufs/inode.h>

16
sys/fs/nfsclient/nfs_clcomsubs.c
View File

@ -55,7 +55,7 @@ static nfsuint64 nfs_nullcookie = {{ 0, 0 }};
* copies a uio scatter/gather list to an mbuf chain.
* NOTE: can ony handle iovcnt == 1
*/
APPLESTATIC void
void
nfsm_uiombuf(struct nfsrv_descript *nd, struct uio *uiop, int siz)
{
char *uiocp;
@ -206,7 +206,7 @@ nfsm_uiombuflist(struct uio *uiop, int siz, struct mbuf **mbp, char **cpp)
* Load vnode attributes from the xdr file attributes.
* Returns EBADRPC if they can't be parsed, 0 otherwise.
*/
APPLESTATIC int
int
nfsm_loadattr(struct nfsrv_descript *nd, struct nfsvattr *nap)
{
struct nfs_fattr *fp;
@ -273,7 +273,7 @@ nfsm_loadattr(struct nfsrv_descript *nd, struct nfsvattr *nap)
* This function finds the directory cookie that corresponds to the
* logical byte offset given.
*/
APPLESTATIC nfsuint64 *
nfsuint64 *
nfscl_getcookie(struct nfsnode *np, off_t off, int add)
{
struct nfsdmap *dp, *dp2;
@ -325,7 +325,7 @@ nfscl_getcookie(struct nfsnode *np, off_t off, int add)
* the file handle and the file's attributes.
* For V4, it assumes that Getfh and Getattr Op's results are here.
*/
APPLESTATIC int
int
nfscl_mtofh(struct nfsrv_descript *nd, struct nfsfh **nfhpp,
struct nfsvattr *nap, int *attrflagp)
{
@ -386,7 +386,7 @@ nfscl_mtofh(struct nfsrv_descript *nd, struct nfsfh **nfhpp,
/*
* Initialize the owner/delegation sleep lock.
*/
APPLESTATIC void
void
nfscl_lockinit(struct nfsv4lock *lckp)
{
@ -398,7 +398,7 @@ nfscl_lockinit(struct nfsv4lock *lckp)
* Get an exclusive lock. (Not needed for OpenBSD4, since there is only one
* thread for each posix process in the kernel.)
*/
APPLESTATIC void
void
nfscl_lockexcl(struct nfsv4lock *lckp, void *mutex)
{
int igotlock;
@ -411,7 +411,7 @@ nfscl_lockexcl(struct nfsv4lock *lckp, void *mutex)
/*
* Release an exclusive lock.
*/
APPLESTATIC void
void
nfscl_lockunlock(struct nfsv4lock *lckp)
{
@ -421,7 +421,7 @@ nfscl_lockunlock(struct nfsv4lock *lckp)
/*
* Called to derefernce a lock on a stateid (delegation or open owner).
*/
APPLESTATIC void
void
nfscl_lockderef(struct nfsv4lock *lckp)
{

2
sys/fs/nfsclient/nfs_clport.c
View File

@ -1108,7 +1108,7 @@ nfscl_checksattr(struct vattr *vap, struct nfsvattr *nvap)
* error should only be returned for the Open, Create and Setattr Ops.
* As such, most calls can just pass in 0 for those arguments.
*/
APPLESTATIC int
int
nfscl_maperr(struct thread *td, int error, uid_t uid, gid_t gid)
{
struct proc *p;

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

@ -226,7 +226,7 @@ int nfs_pnfsio(task_fn_t *, void *);
/*
* nfs null call from vfs.
*/
APPLESTATIC int
int
nfsrpc_null(vnode_t vp, struct ucred *cred, NFSPROC_T *p)
{
int error;
@ -245,7 +245,7 @@ nfsrpc_null(vnode_t vp, struct ucred *cred, NFSPROC_T *p)
* For nfs version 3 and 4, use the access rpc to check accessibility. If file
* modes are changed on the server, accesses might still fail later.
*/
APPLESTATIC int
int
nfsrpc_access(vnode_t vp, int acmode, struct ucred *cred,
NFSPROC_T *p, struct nfsvattr *nap, int *attrflagp)
{
@ -288,7 +288,7 @@ nfsrpc_access(vnode_t vp, int acmode, struct ucred *cred,
/*
* The actual rpc, separated out for Darwin.
*/
APPLESTATIC int
int
nfsrpc_accessrpc(vnode_t vp, u_int32_t mode, struct ucred *cred,
NFSPROC_T *p, struct nfsvattr *nap, int *attrflagp, u_int32_t *rmodep,
void *stuff)
@ -349,7 +349,7 @@ nfsrpc_accessrpc(vnode_t vp, u_int32_t mode, struct ucred *cred,
/*
* nfs open rpc
*/
APPLESTATIC int
int
nfsrpc_open(vnode_t vp, int amode, struct ucred *cred, NFSPROC_T *p)
{
struct nfsclopen *op;
@ -481,7 +481,7 @@ else printf(" fhl=0\n");
/*
* the actual open rpc
*/
APPLESTATIC int
int
nfsrpc_openrpc(struct nfsmount *nmp, vnode_t vp, u_int8_t *nfhp, int fhlen,
u_int8_t *newfhp, int newfhlen, u_int32_t mode, struct nfsclopen *op,
u_int8_t *name, int namelen, struct nfscldeleg **dpp,
@ -684,7 +684,7 @@ nfsrpc_openrpc(struct nfsmount *nmp, vnode_t vp, u_int8_t *nfhp, int fhlen,
/*
* open downgrade rpc
*/
APPLESTATIC int
int
nfsrpc_opendowngrade(vnode_t vp, u_int32_t mode, struct nfsclopen *op,
struct ucred *cred, NFSPROC_T *p)
{
@ -727,7 +727,7 @@ nfsrpc_opendowngrade(vnode_t vp, u_int32_t mode, struct nfsclopen *op,
/*
* V4 Close operation.
*/
APPLESTATIC int
int
nfsrpc_close(vnode_t vp, int doclose, NFSPROC_T *p)
{
struct nfsclclient *clp;
@ -749,7 +749,7 @@ nfsrpc_close(vnode_t vp, int doclose, NFSPROC_T *p)
/*
* Close the open.
*/
APPLESTATIC void
void
nfsrpc_doclose(struct nfsmount *nmp, struct nfsclopen *op, NFSPROC_T *p)
{
struct nfsrv_descript nfsd, *nd = &nfsd;
@ -846,7 +846,7 @@ nfsrpc_doclose(struct nfsmount *nmp, struct nfsclopen *op, NFSPROC_T *p)
/*
* The actual Close RPC.
*/
APPLESTATIC int
int
nfsrpc_closerpc(struct nfsrv_descript *nd, struct nfsmount *nmp,
struct nfsclopen *op, struct ucred *cred, NFSPROC_T *p,
int syscred)
@ -885,7 +885,7 @@ nfsrpc_closerpc(struct nfsrv_descript *nd, struct nfsmount *nmp,
/*
* V4 Open Confirm RPC.
*/
APPLESTATIC int
int
nfsrpc_openconfirm(vnode_t vp, u_int8_t *nfhp, int fhlen,
struct nfsclopen *op, struct ucred *cred, NFSPROC_T *p)
{
@ -928,7 +928,7 @@ nfsrpc_openconfirm(vnode_t vp, u_int8_t *nfhp, int fhlen,
* Do the setclientid and setclientid confirm RPCs. Called from nfs_statfs()
* when a mount has just occurred and when the server replies NFSERR_EXPIRED.
*/
APPLESTATIC int
int
nfsrpc_setclient(struct nfsmount *nmp, struct nfsclclient *clp, int reclaim,
bool *retokp, struct ucred *cred, NFSPROC_T *p)
{
@ -1184,7 +1184,7 @@ nfsrpc_setclient(struct nfsmount *nmp, struct nfsclclient *clp, int reclaim,
/*
* nfs getattr call.
*/
APPLESTATIC int
int
nfsrpc_getattr(vnode_t vp, struct ucred *cred, NFSPROC_T *p,
struct nfsvattr *nap, void *stuff)
{
@ -1211,7 +1211,7 @@ nfsrpc_getattr(vnode_t vp, struct ucred *cred, NFSPROC_T *p,
/*
* nfs getattr call with non-vnode arguemnts.
*/
APPLESTATIC int
int
nfsrpc_getattrnovp(struct nfsmount *nmp, u_int8_t *fhp, int fhlen, int syscred,
struct ucred *cred, NFSPROC_T *p, struct nfsvattr *nap, u_int64_t *xidp,
uint32_t *leasep)
@ -1251,7 +1251,7 @@ nfsrpc_getattrnovp(struct nfsmount *nmp, u_int8_t *fhp, int fhlen, int syscred,
/*
* Do an nfs setattr operation.
*/
APPLESTATIC int
int
nfsrpc_setattr(vnode_t vp, struct vattr *vap, NFSACL_T *aclp,
struct ucred *cred, NFSPROC_T *p, struct nfsvattr *rnap, int *attrflagp,
void *stuff)
@ -1378,7 +1378,7 @@ nfsrpc_setattrrpc(vnode_t vp, struct vattr *vap,
/*
* nfs lookup rpc
*/
APPLESTATIC int
int
nfsrpc_lookup(vnode_t dvp, char *name, int len, struct ucred *cred,
NFSPROC_T *p, struct nfsvattr *dnap, struct nfsvattr *nap,
struct nfsfh **nfhpp, int *attrflagp, int *dattrflagp, void *stuff)
@ -1481,7 +1481,7 @@ nfsrpc_lookup(vnode_t dvp, char *name, int len, struct ucred *cred,
/*
* Do a readlink rpc.
*/
APPLESTATIC int
int
nfsrpc_readlink(vnode_t vp, struct uio *uiop, struct ucred *cred,
NFSPROC_T *p, struct nfsvattr *nap, int *attrflagp, void *stuff)
{
@ -1537,7 +1537,7 @@ nfsrpc_readlink(vnode_t vp, struct uio *uiop, struct ucred *cred,
/*
* Read operation.
*/
APPLESTATIC int
int
nfsrpc_read(vnode_t vp, struct uio *uiop, struct ucred *cred,
NFSPROC_T *p, struct nfsvattr *nap, int *attrflagp, void *stuff)
{
@ -1695,7 +1695,7 @@ nfsrpc_readrpc(vnode_t vp, struct uio *uiop, struct ucred *cred,
* the recovery thread could get stuck waiting for the buffer and recovery
* will then deadlock.
*/
APPLESTATIC int
int
nfsrpc_write(vnode_t vp, struct uio *uiop, int *iomode, int *must_commit,
struct ucred *cred, NFSPROC_T *p, struct nfsvattr *nap, int *attrflagp,
void *stuff, int called_from_strategy)
@ -1960,7 +1960,7 @@ nfsrpc_writerpc(vnode_t vp, struct uio *uiop, int *iomode,
* For NFS v2 this is a kludge. Use a create rpc but with the IFMT bits of the
* mode set to specify the file type and the size field for rdev.
*/
APPLESTATIC int
int
nfsrpc_mknod(vnode_t dvp, char *name, int namelen, struct vattr *vap,
u_int32_t rdev, enum vtype vtyp, struct ucred *cred, NFSPROC_T *p,
struct nfsvattr *dnap, struct nfsvattr *nnap, struct nfsfh **nfhpp,
@ -2040,7 +2040,7 @@ nfsrpc_mknod(vnode_t dvp, char *name, int namelen, struct vattr *vap,
* Mostly just call the approriate routine. (I separated out v4, so that
* error recovery wouldn't be as difficult.)
*/
APPLESTATIC int
int
nfsrpc_create(vnode_t dvp, char *name, int namelen, struct vattr *vap,
nfsquad_t cverf, int fmode, struct ucred *cred, NFSPROC_T *p,
struct nfsvattr *dnap, struct nfsvattr *nnap, struct nfsfh **nfhpp,
@ -2407,7 +2407,7 @@ nfsrpc_createv4(vnode_t dvp, char *name, int namelen, struct vattr *vap,
/*
* Nfs remove rpc
*/
APPLESTATIC int
int
nfsrpc_remove(vnode_t dvp, char *name, int namelen, vnode_t vp,
struct ucred *cred, NFSPROC_T *p, struct nfsvattr *dnap, int *dattrflagp,
void *dstuff)
@ -2484,7 +2484,7 @@ nfsrpc_remove(vnode_t dvp, char *name, int namelen, vnode_t vp,
/*
* Do an nfs rename rpc.
*/
APPLESTATIC int
int
nfsrpc_rename(vnode_t fdvp, vnode_t fvp, char *fnameptr, int fnamelen,
vnode_t tdvp, vnode_t tvp, char *tnameptr, int tnamelen, struct ucred *cred,
NFSPROC_T *p, struct nfsvattr *fnap, struct nfsvattr *tnap,
@ -2642,7 +2642,7 @@ nfsrpc_rename(vnode_t fdvp, vnode_t fvp, char *fnameptr, int fnamelen,
/*
* nfs hard link create rpc
*/
APPLESTATIC int
int
nfsrpc_link(vnode_t dvp, vnode_t vp, char *name, int namelen,
struct ucred *cred, NFSPROC_T *p, struct nfsvattr *dnap,
struct nfsvattr *nap, int *attrflagp, int *dattrflagp, void *dstuff)
@ -2705,7 +2705,7 @@ nfsrpc_link(vnode_t dvp, vnode_t vp, char *name, int namelen,
/*
* nfs symbolic link create rpc
*/
APPLESTATIC int
int
nfsrpc_symlink(vnode_t dvp, char *name, int namelen, const char *target,
struct vattr *vap, struct ucred *cred, NFSPROC_T *p, struct nfsvattr *dnap,
struct nfsvattr *nnap, struct nfsfh **nfhpp, int *attrflagp,
@ -2766,7 +2766,7 @@ nfsrpc_symlink(vnode_t dvp, char *name, int namelen, const char *target,
/*
* nfs make dir rpc
*/
APPLESTATIC int
int
nfsrpc_mkdir(vnode_t dvp, char *name, int namelen, struct vattr *vap,
struct ucred *cred, NFSPROC_T *p, struct nfsvattr *dnap,
struct nfsvattr *nnap, struct nfsfh **nfhpp, int *attrflagp,
@ -2848,7 +2848,7 @@ nfsrpc_mkdir(vnode_t dvp, char *name, int namelen, struct vattr *vap,
/*
* nfs remove directory call
*/
APPLESTATIC int
int
nfsrpc_rmdir(vnode_t dvp, char *name, int namelen, struct ucred *cred,
NFSPROC_T *p, struct nfsvattr *dnap, int *dattrflagp, void *dstuff)
{
@ -2904,7 +2904,7 @@ nfsrpc_rmdir(vnode_t dvp, char *name, int namelen, struct ucred *cred,
* and returns the one for the next entry after this directory block in
* there, as well.
*/
APPLESTATIC int
int
nfsrpc_readdir(vnode_t vp, struct uio *uiop, nfsuint64 *cookiep,
struct ucred *cred, NFSPROC_T *p, struct nfsvattr *nap, int *attrflagp,
int *eofp, void *stuff)
@ -3351,7 +3351,7 @@ nfsrpc_readdir(vnode_t vp, struct uio *uiop, nfsuint64 *cookiep,
* (Also used for NFS V4 when mount flag set.)
* (ditto above w.r.t. multiple of DIRBLKSIZ, etc.)
*/
APPLESTATIC int
int
nfsrpc_readdirplus(vnode_t vp, struct uio *uiop, nfsuint64 *cookiep,
struct ucred *cred, NFSPROC_T *p, struct nfsvattr *nap, int *attrflagp,
int *eofp, void *stuff)
@ -3860,7 +3860,7 @@ nfsrpc_readdirplus(vnode_t vp, struct uio *uiop, nfsuint64 *cookiep,
/*
* Nfs commit rpc
*/
APPLESTATIC int
int
nfsrpc_commit(vnode_t vp, u_quad_t offset, int cnt, struct ucred *cred,
NFSPROC_T *p, struct nfsvattr *nap, int *attrflagp, void *stuff)
{
@ -3911,7 +3911,7 @@ nfsrpc_commit(vnode_t vp, u_quad_t offset, int cnt, struct ucred *cred,
* NFS byte range lock rpc.
* (Mostly just calls one of the three lower level RPC routines.)
*/
APPLESTATIC int
int
nfsrpc_advlock(vnode_t vp, off_t size, int op, struct flock *fl,
int reclaim, struct ucred *cred, NFSPROC_T *p, void *id, int flags)
{
@ -4078,7 +4078,7 @@ nfsrpc_advlock(vnode_t vp, off_t size, int op, struct flock *fl,
/*
* The lower level routine for the LockT case.
*/
APPLESTATIC int
int
nfsrpc_lockt(struct nfsrv_descript *nd, vnode_t vp,
struct nfsclclient *clp, u_int64_t off, u_int64_t len, struct flock *fl,
struct ucred *cred, NFSPROC_T *p, void *id, int flags)
@ -4203,7 +4203,7 @@ nfsrpc_locku(struct nfsrv_descript *nd, struct nfsmount *nmp,
/*
* The actual Lock RPC.
*/
APPLESTATIC int
int
nfsrpc_lock(struct nfsrv_descript *nd, struct nfsmount *nmp, vnode_t vp,
u_int8_t *nfhp, int fhlen, struct nfscllockowner *lp, int newone,
int reclaim, u_int64_t off, u_int64_t len, short type, struct ucred *cred,
@ -4292,7 +4292,7 @@ nfsrpc_lock(struct nfsrv_descript *nd, struct nfsmount *nmp, vnode_t vp,
* nfs statfs rpc
* (always called with the vp for the mount point)
*/
APPLESTATIC int
int
nfsrpc_statfs(vnode_t vp, struct nfsstatfs *sbp, struct nfsfsinfo *fsp,
struct ucred *cred, NFSPROC_T *p, struct nfsvattr *nap, int *attrflagp,
void *stuff)
@ -4371,7 +4371,7 @@ nfsrpc_statfs(vnode_t vp, struct nfsstatfs *sbp, struct nfsfsinfo *fsp,
/*
* nfs pathconf rpc
*/
APPLESTATIC int
int
nfsrpc_pathconf(vnode_t vp, struct nfsv3_pathconf *pc,
struct ucred *cred, NFSPROC_T *p, struct nfsvattr *nap, int *attrflagp,
void *stuff)
@ -4432,7 +4432,7 @@ nfsrpc_pathconf(vnode_t vp, struct nfsv3_pathconf *pc,
/*
* nfs version 3 fsinfo rpc call
*/
APPLESTATIC int
int
nfsrpc_fsinfo(vnode_t vp, struct nfsfsinfo *fsp, struct ucred *cred,
NFSPROC_T *p, struct nfsvattr *nap, int *attrflagp, void *stuff)
{
@ -4471,7 +4471,7 @@ nfsrpc_fsinfo(vnode_t vp, struct nfsfsinfo *fsp, struct ucred *cred,
/*
* This function performs the Renew RPC.
*/
APPLESTATIC int
int
nfsrpc_renew(struct nfsclclient *clp, struct nfsclds *dsp, struct ucred *cred,
NFSPROC_T *p)
{
@ -4525,7 +4525,7 @@ nfsrpc_renew(struct nfsclclient *clp, struct nfsclds *dsp, struct ucred *cred,
/*
* This function performs the Releaselockowner RPC.
*/
APPLESTATIC int
int
nfsrpc_rellockown(struct nfsmount *nmp, struct nfscllockowner *lp,
uint8_t *fh, int fhlen, struct ucred *cred, NFSPROC_T *p)
{
@ -4564,7 +4564,7 @@ nfsrpc_rellockown(struct nfsmount *nmp, struct nfscllockowner *lp,
/*
* This function performs the Compound to get the mount pt FH.
*/
APPLESTATIC int
int
nfsrpc_getdirpath(struct nfsmount *nmp, u_char *dirpath, struct ucred *cred,
NFSPROC_T *p)
{
@ -4633,7 +4633,7 @@ nfsrpc_getdirpath(struct nfsmount *nmp, u_char *dirpath, struct ucred *cred,
/*
* This function performs the Delegreturn RPC.
*/
APPLESTATIC int
int
nfsrpc_delegreturn(struct nfscldeleg *dp, struct ucred *cred,
struct nfsmount *nmp, NFSPROC_T *p, int syscred)
{
@ -4666,7 +4666,7 @@ nfsrpc_delegreturn(struct nfscldeleg *dp, struct ucred *cred,
/*
* nfs getacl call.
*/
APPLESTATIC int
int
nfsrpc_getacl(vnode_t vp, struct ucred *cred, NFSPROC_T *p,
struct acl *aclp, void *stuff)
{
@ -4696,7 +4696,7 @@ nfsrpc_getacl(vnode_t vp, struct ucred *cred, NFSPROC_T *p,
/*
* nfs setacl call.
*/
APPLESTATIC int
int
nfsrpc_setacl(vnode_t vp, struct ucred *cred, NFSPROC_T *p,
struct acl *aclp, void *stuff)
{
@ -6829,7 +6829,7 @@ nfsio_commitds(vnode_t vp, uint64_t offset, int cnt, struct nfsclds *dsp,
/*
* NFS Advise rpc
*/
APPLESTATIC int
int
nfsrpc_advise(vnode_t vp, off_t offset, uint64_t cnt, int advise,
struct ucred *cred, NFSPROC_T *p)
{
@ -6970,7 +6970,7 @@ nfsio_adviseds(vnode_t vp, uint64_t offset, int cnt, int advise,
/*
* Do the Allocate operation, retrying for recovery.
*/
APPLESTATIC int
int
nfsrpc_allocate(vnode_t vp, off_t off, off_t len, struct nfsvattr *nap,
int *attrflagp, struct ucred *cred, NFSPROC_T *p, void *stuff)
{
@ -8077,7 +8077,7 @@ nfsrpc_layoutgetres(struct nfsmount *nmp, vnode_t vp, uint8_t *newfhp,
/*
* nfs copy_file_range operation.
*/
APPLESTATIC int
int
nfsrpc_copy_file_range(vnode_t invp, off_t *inoffp, vnode_t outvp,
off_t *outoffp, size_t *lenp, unsigned int flags, int *inattrflagp,
struct nfsvattr *innap, int *outattrflagp, struct nfsvattr *outnap,
@ -8271,7 +8271,7 @@ nfsrpc_copyrpc(vnode_t invp, off_t inoff, vnode_t outvp, off_t outoff,
/*
* Seek operation.
*/
APPLESTATIC int
int
nfsrpc_seek(vnode_t vp, off_t *offp, bool *eofp, int content,
struct ucred *cred, struct nfsvattr *nap, int *attrflagp)
{
@ -8365,7 +8365,7 @@ nfsrpc_seekrpc(vnode_t vp, off_t *offp, nfsv4stateid_t *stateidp, bool *eofp,
/*
* The getextattr RPC.
*/
APPLESTATIC int
int
nfsrpc_getextattr(vnode_t vp, const char *name, struct uio *uiop, ssize_t *lenp,
struct nfsvattr *nap, int *attrflagp, struct ucred *cred, NFSPROC_T *p)
{
@ -8436,7 +8436,7 @@ nfsrpc_getextattr(vnode_t vp, const char *name, struct uio *uiop, ssize_t *lenp,
/*
* The setextattr RPC.
*/
APPLESTATIC int
int
nfsrpc_setextattr(vnode_t vp, const char *name, struct uio *uiop,
struct nfsvattr *nap, int *attrflagp, struct ucred *cred, NFSPROC_T *p)
{
@ -8484,7 +8484,7 @@ nfsrpc_setextattr(vnode_t vp, const char *name, struct uio *uiop,
/*
* The removeextattr RPC.
*/
APPLESTATIC int
int
nfsrpc_rmextattr(vnode_t vp, const char *name, struct nfsvattr *nap,
int *attrflagp, struct ucred *cred, NFSPROC_T *p)
{
@ -8522,7 +8522,7 @@ nfsrpc_rmextattr(vnode_t vp, const char *name, struct nfsvattr *nap,
/*
* The listextattr RPC.
*/
APPLESTATIC int
int
nfsrpc_listextattr(vnode_t vp, uint64_t *cookiep, struct uio *uiop,
size_t *lenp, bool *eofp, struct nfsvattr *nap, int *attrflagp,
struct ucred *cred, NFSPROC_T *p)

86
sys/fs/nfsclient/nfs_clstate.c
View File

@ -209,7 +209,7 @@ static short *nfscl_cberrmap[] = {
* Called for an open operation.
* If the nfhp argument is NULL, just get an openowner.
*/
APPLESTATIC int
int
nfscl_open(vnode_t vp, u_int8_t *nfhp, int fhlen, u_int32_t amode, int usedeleg,
struct ucred *cred, NFSPROC_T *p, struct nfsclowner **owpp,
struct nfsclopen **opp, int *newonep, int *retp, int lockit)
@ -425,7 +425,7 @@ nfscl_newopen(struct nfsclclient *clp, struct nfscldeleg *dp,
/*
* Called to find/add a delegation to a client.
*/
APPLESTATIC int
int
nfscl_deleg(mount_t mp, struct nfsclclient *clp, u_int8_t *nfhp,
int fhlen, struct ucred *cred, NFSPROC_T *p, struct nfscldeleg **dpp)
{
@ -496,7 +496,7 @@ nfscl_finddeleg(struct nfsclclient *clp, u_int8_t *fhp, int fhlen)
* found, return either a lockowner stateid or the open stateid.
* If no Open is found, just return error and the special stateid of all zeros.
*/
APPLESTATIC int
int
nfscl_getstateid(vnode_t vp, u_int8_t *nfhp, int fhlen, u_int32_t mode,
int fords, struct ucred *cred, NFSPROC_T *p, nfsv4stateid_t *stateidp,
void **lckpp)
@ -720,7 +720,7 @@ nfscl_getopen(struct nfsclownerhead *ohp, u_int8_t *nfhp, int fhlen,
* Release use of an open owner. Called when open operations are done
* with the open owner.
*/
APPLESTATIC void
void
nfscl_ownerrelease(struct nfsmount *nmp, struct nfsclowner *owp,
__unused int error, __unused int candelete, int unlocked)
{
@ -741,7 +741,7 @@ nfscl_ownerrelease(struct nfsmount *nmp, struct nfsclowner *owp,
/*
* Release use of an open structure under an open owner.
*/
APPLESTATIC void
void
nfscl_openrelease(struct nfsmount *nmp, struct nfsclopen *op, int error,
int candelete)
{
@ -775,7 +775,7 @@ nfscl_openrelease(struct nfsmount *nmp, struct nfsclopen *op, int error,
* thread if this creates a new clp.
* It always clpp with a reference count on it, unless returning an error.
*/
APPLESTATIC int
int
nfscl_getcl(struct mount *mp, struct ucred *cred, NFSPROC_T *p,
int start_renewthread, struct nfsclclient **clpp)
{
@ -938,7 +938,7 @@ nfscl_getcl(struct mount *mp, struct ucred *cred, NFSPROC_T *p,
/*
* Get a reference to a clientid and return it, if valid.
*/
APPLESTATIC struct nfsclclient *
struct nfsclclient *
nfscl_findcl(struct nfsmount *nmp)
{
struct nfsclclient *clp;
@ -965,7 +965,7 @@ nfscl_clrelease(struct nfsclclient *clp)
/*
* External call for nfscl_clrelease.
*/
APPLESTATIC void
void
nfscl_clientrelease(struct nfsclclient *clp)
{
@ -980,7 +980,7 @@ nfscl_clientrelease(struct nfsclclient *clp)
/*
* Called when wanting to lock a byte region.
*/
APPLESTATIC int
int
nfscl_getbytelock(vnode_t vp, u_int64_t off, u_int64_t len,
short type, struct ucred *cred, NFSPROC_T *p, struct nfsclclient *rclp,
int recovery, void *id, int flags, u_int8_t *rownp, u_int8_t *ropenownp,
@ -1180,7 +1180,7 @@ nfscl_getbytelock(vnode_t vp, u_int64_t off, u_int64_t len,
/*
* Called to unlock a byte range, for LockU.
*/
APPLESTATIC int
int
nfscl_relbytelock(vnode_t vp, u_int64_t off, u_int64_t len,
__unused struct ucred *cred, NFSPROC_T *p, int callcnt,
struct nfsclclient *clp, void *id, int flags,
@ -1292,7 +1292,7 @@ nfscl_relbytelock(vnode_t vp, u_int64_t off, u_int64_t len,
/*
* Release all lockowners marked in progess for this process and file.
*/
APPLESTATIC void
void
nfscl_releasealllocks(struct nfsclclient *clp, vnode_t vp, NFSPROC_T *p,
void *id, int flags)
{
@ -1330,7 +1330,7 @@ nfscl_releasealllocks(struct nfsclclient *clp, vnode_t vp, NFSPROC_T *p,
* is required before a LockU.
* If in doubt, return 1, so the flush will occur.
*/
APPLESTATIC int
int
nfscl_checkwritelocked(vnode_t vp, struct flock *fl,
struct ucred *cred, NFSPROC_T *p, void *id, int flags)
{
@ -1436,7 +1436,7 @@ nfscl_checkwritelocked(vnode_t vp, struct flock *fl,
/*
* Release a byte range lock owner structure.
*/
APPLESTATIC void
void
nfscl_lockrelease(struct nfscllockowner *lp, int error, int candelete)
{
struct nfsclclient *clp;
@ -1457,7 +1457,7 @@ nfscl_lockrelease(struct nfscllockowner *lp, int error, int candelete)
/*
* Free up an open structure and any associated byte range lock structures.
*/
APPLESTATIC void
void
nfscl_freeopen(struct nfsclopen *op, int local)
{
@ -1554,7 +1554,7 @@ nfscl_freeopenowner(struct nfsclowner *owp, int local)
/*
* Free up a byte range lock owner structure.
*/
APPLESTATIC void
void
nfscl_freelockowner(struct nfscllockowner *lp, int local)
{
struct nfscllock *lop, *nlop;
@ -1573,7 +1573,7 @@ nfscl_freelockowner(struct nfscllockowner *lp, int local)
/*
* Free up a byte range lock structure.
*/
APPLESTATIC void
void
nfscl_freelock(struct nfscllock *lop, int local)
{
@ -1880,7 +1880,7 @@ static int fake_global; /* Used to force visibility of MNTK_UNMOUNTF */
/*
* Called from nfs umount to free up the clientid.
*/
APPLESTATIC void
void
nfscl_umount(struct nfsmount *nmp, NFSPROC_T *p)
{
struct nfsclclient *clp;
@ -2300,7 +2300,7 @@ nfscl_recover(struct nfsclclient *clp, bool *retokp, struct ucred *cred,
* XXX Someday it should post a signal to the process(es) that hold the
* state, so they know that lock state has been lost.
*/
APPLESTATIC int
int
nfscl_hasexpired(struct nfsclclient *clp, u_int32_t clidrev, NFSPROC_T *p)
{
struct nfsmount *nmp;
@ -2528,7 +2528,7 @@ nfscl_updatelock(struct nfscllockowner *lp, struct nfscllock **new_lopp,
* This function must be run as a kernel thread.
* It does Renew Ops and recovery, when required.
*/
APPLESTATIC void
void
nfscl_renewthread(struct nfsclclient *clp, NFSPROC_T *p)
{
struct nfsclowner *owp, *nowp;
@ -2865,7 +2865,7 @@ nfscl_renewthread(struct nfsclclient *clp, NFSPROC_T *p)
* Initiate state recovery. Called when NFSERR_STALECLIENTID,
* NFSERR_STALESTATEID or NFSERR_BADSESSION is received.
*/
APPLESTATIC void
void
nfscl_initiate_recovery(struct nfsclclient *clp)
{
@ -2880,7 +2880,7 @@ nfscl_initiate_recovery(struct nfsclclient *clp)
/*
* Dump out the state stuff for debugging.
*/
APPLESTATIC void
void
nfscl_dumpstate(struct nfsmount *nmp, int openowner, int opens,
int lockowner, int locks)
{
@ -2976,7 +2976,7 @@ nfscl_dumpstate(struct nfsmount *nmp, int openowner, int opens,
* Check for duplicate open owners and opens.
* (Only used as a diagnostic aid.)
*/
APPLESTATIC void
void
nfscl_dupopen(vnode_t vp, int dupopens)
{
struct nfsclclient *clp;
@ -3085,7 +3085,7 @@ nfscl_dupopen(vnode_t vp, int dupopens)
* If it returns 0 for success, there will be a referenced
* clp returned via clpp.
*/
APPLESTATIC int
int
nfscl_getclose(vnode_t vp, struct nfsclclient **clpp)
{
struct nfsclclient *clp;
@ -3159,7 +3159,7 @@ nfscl_getclose(vnode_t vp, struct nfsclclient **clpp)
return (0);
}
APPLESTATIC int
int
nfscl_doclose(vnode_t vp, struct nfsclclient **clpp, NFSPROC_T *p)
{
struct nfsclclient *clp;
@ -3252,7 +3252,7 @@ nfscl_delegreturnall(struct nfsclclient *clp, NFSPROC_T *p)
/*
* Do a callback RPC.
*/
APPLESTATIC void
void
nfscl_docb(struct nfsrv_descript *nd, NFSPROC_T *p)
{
int clist, gotseq_ok, i, j, k, op, rcalls;
@ -3862,7 +3862,7 @@ nfscl_checkconflict(struct nfscllockownerhead *lhp, struct nfscllock *nlop,
/*
* Check for a local conflicting lock.
*/
APPLESTATIC int
int
nfscl_lockt(vnode_t vp, struct nfsclclient *clp, u_int64_t off,
u_int64_t len, struct flock *fl, NFSPROC_T *p, void *id, int flags)
{
@ -4303,7 +4303,7 @@ nfscl_trydelegreturn(struct nfscldeleg *dp, struct ucred *cred,
* retrying while NFSERR_DELAY. Also, try system credentials, if the passed in
* credentials fail.
*/
APPLESTATIC int
int
nfscl_tryclose(struct nfsclopen *op, struct ucred *cred,
struct nfsmount *nmp, NFSPROC_T *p)
{
@ -4332,7 +4332,7 @@ nfscl_tryclose(struct nfsclopen *op, struct ucred *cred,
* to the server. This might be a big performance win in some environments.
* (Not useful until the client does caching on local stable storage.)
*/
APPLESTATIC int
int
nfscl_mustflush(vnode_t vp)
{
struct nfsclclient *clp;
@ -4366,7 +4366,7 @@ nfscl_mustflush(vnode_t vp)
/*
* See if a (write) delegation exists for this file.
*/
APPLESTATIC int
int
nfscl_nodeleg(vnode_t vp, int writedeleg)
{
struct nfsclclient *clp;
@ -4399,7 +4399,7 @@ nfscl_nodeleg(vnode_t vp, int writedeleg)
/*
* Look for an associated delegation that should be DelegReturned.
*/
APPLESTATIC int
int
nfscl_removedeleg(vnode_t vp, NFSPROC_T *p, nfsv4stateid_t *stp)
{
struct nfsclclient *clp;
@ -4495,7 +4495,7 @@ nfscl_removedeleg(vnode_t vp, NFSPROC_T *p, nfsv4stateid_t *stp)
/*
* Look for associated delegation(s) that should be DelegReturned.
*/
APPLESTATIC int
int
nfscl_renamedeleg(vnode_t fvp, nfsv4stateid_t *fstp, int *gotfdp, vnode_t tvp,
nfsv4stateid_t *tstp, int *gottdp, NFSPROC_T *p)
{
@ -4631,7 +4631,7 @@ nfscl_renamedeleg(vnode_t fvp, nfsv4stateid_t *fstp, int *gotfdp, vnode_t tvp,
* Get a reference on the clientid associated with the mount point.
* Return 1 if success, 0 otherwise.
*/
APPLESTATIC int
int
nfscl_getref(struct nfsmount *nmp)
{
struct nfsclclient *clp;
@ -4650,7 +4650,7 @@ nfscl_getref(struct nfsmount *nmp)
/*
* Release a reference on a clientid acquired with the above call.
*/
APPLESTATIC void
void
nfscl_relref(struct nfsmount *nmp)
{
struct nfsclclient *clp;
@ -4669,7 +4669,7 @@ nfscl_relref(struct nfsmount *nmp)
* Save the size attribute in the delegation, since the nfsnode
* is going away.
*/
APPLESTATIC void
void
nfscl_reclaimnode(vnode_t vp)
{
struct nfsclclient *clp;
@ -4696,7 +4696,7 @@ nfscl_reclaimnode(vnode_t vp)
* Get the saved size attribute in the delegation, since it is a
* newly allocated nfsnode.
*/
APPLESTATIC void
void
nfscl_newnode(vnode_t vp)
{
struct nfsclclient *clp;
@ -4723,7 +4723,7 @@ nfscl_newnode(vnode_t vp)
* If there is a valid write delegation for this file, set the modtime
* to the local clock time.
*/
APPLESTATIC void
void
nfscl_delegmodtime(vnode_t vp)
{
struct nfsclclient *clp;
@ -4752,7 +4752,7 @@ nfscl_delegmodtime(vnode_t vp)
* If there is a valid write delegation for this file with a modtime set,
* put that modtime in mtime.
*/
APPLESTATIC void
void
nfscl_deleggetmodtime(vnode_t vp, struct timespec *mtime)
{
struct nfsclclient *clp;
@ -4813,7 +4813,7 @@ nfscl_errmap(struct nfsrv_descript *nd, u_int32_t minorvers)
* error is returned.
* If a layout is passed in via lypp, it is locked (exclusively locked).
*/
APPLESTATIC int
int
nfscl_layout(struct nfsmount *nmp, vnode_t vp, u_int8_t *fhp, int fhlen,
nfsv4stateid_t *stateidp, int layouttype, int retonclose,
struct nfsclflayouthead *fhlp, struct nfscllayout **lypp,
@ -5035,7 +5035,7 @@ nfscl_dserr(uint32_t op, uint32_t stat, struct nfscldevinfo *dp,
* If NFSCLDS_SAMECONN is set, the connection is shared with other DSs and
* cannot be shut down.
*/
APPLESTATIC void
void
nfscl_cancelreqs(struct nfsclds *dsp)
{
struct __rpc_client *cl;
@ -5176,7 +5176,7 @@ nfscl_mergeflayouts(struct nfsclflayouthead *fhlp,
* Add this nfscldevinfo to the client, if it doesn't already exist.
* This function consumes the structure pointed at by dip, if not NULL.
*/
APPLESTATIC int
int
nfscl_adddevinfo(struct nfsmount *nmp, struct nfscldevinfo *dip, int ind,
struct nfsclflayout *flp)
{
@ -5226,7 +5226,7 @@ nfscl_adddevinfo(struct nfsmount *nmp, struct nfscldevinfo *dip, int ind,
/*
* Free up a layout structure and associated file layout structure(s).
*/
APPLESTATIC void
void
nfscl_freelayout(struct nfscllayout *layp)
{
struct nfsclflayout *flp, *nflp;
@ -5251,7 +5251,7 @@ nfscl_freelayout(struct nfscllayout *layp)
/*
* Free up a file layout structure.
*/
APPLESTATIC void
void
nfscl_freeflayout(struct nfsclflayout *flp)
{
int i, j;
@ -5275,7 +5275,7 @@ nfscl_freeflayout(struct nfsclflayout *flp)
/*
* Free up a file layout devinfo structure.
*/
APPLESTATIC void
void
nfscl_freedevinfo(struct nfscldevinfo *dip)
{

16
sys/fs/nfsserver/nfs_nfsdcache.c
View File

@ -301,7 +301,7 @@ nfsrc_cachemutex(struct nfsrvcache *rp)
/*
* Initialize the server request cache list
*/
APPLESTATIC void
void
nfsrvd_initcache(void)
{
int i;
@ -326,7 +326,7 @@ nfsrvd_initcache(void)
* Get a cache entry for this request. Basically just malloc a new one
* and then call nfsrc_getudp() or nfsrc_gettcp() to do the rest.
*/
APPLESTATIC int
int
nfsrvd_getcache(struct nfsrv_descript *nd)
{
struct nfsrvcache *newrp;
@ -453,7 +453,7 @@ nfsrc_getudp(struct nfsrv_descript *nd, struct nfsrvcache *newrp)
/*
* Update a request cache entry after the rpc has been done
*/
APPLESTATIC struct nfsrvcache *
struct nfsrvcache *
nfsrvd_updatecache(struct nfsrv_descript *nd)
{
struct nfsrvcache *rp;
@ -555,7 +555,7 @@ nfsrvd_updatecache(struct nfsrv_descript *nd)
* Invalidate and, if possible, free an in prog cache entry.
* Must not sleep.
*/
APPLESTATIC void
void
nfsrvd_delcache(struct nfsrvcache *rp)
{
struct mtx *mutex;
@ -575,7 +575,7 @@ nfsrvd_delcache(struct nfsrvcache *rp)
* the entry's sequence number and unlock it. The argument is
* the pointer returned by nfsrvd_updatecache().
*/
APPLESTATIC void
void
nfsrvd_sentcache(struct nfsrvcache *rp, int have_seq, uint32_t seq)
{
struct nfsrchash_bucket *hbp;
@ -807,7 +807,7 @@ nfsrc_freecache(struct nfsrvcache *rp)
/*
* Clean out the cache. Called when nfsserver module is unloaded.
*/
APPLESTATIC void
void
nfsrvd_cleancache(void)
{
struct nfsrvcache *rp, *nextrp;
@ -972,7 +972,7 @@ nfsrc_trimcache(u_int64_t sockref, uint32_t snd_una, int final)
/*
* Add a seqid# reference to the cache entry.
*/
APPLESTATIC void
void
nfsrvd_refcache(struct nfsrvcache *rp)
{
struct mtx *mutex;
@ -991,7 +991,7 @@ nfsrvd_refcache(struct nfsrvcache *rp)
/*
* Dereference a seqid# cache entry.
*/
APPLESTATIC void
void
nfsrvd_derefcache(struct nfsrvcache *rp)
{
struct mtx *mutex;

118
sys/fs/nfsserver/nfs_nfsdserv.c
View File

@ -110,7 +110,7 @@ static void nfsrvd_mkdirsub(struct nfsrv_descript *nd, struct nameidata *ndp,
/*
* nfs access service (not a part of NFS V2)
*/
APPLESTATIC int
int
nfsrvd_access(struct nfsrv_descript *nd, __unused int isdgram,
vnode_t vp, struct nfsexstuff *exp)
{
@ -217,7 +217,7 @@ nfsrvd_access(struct nfsrv_descript *nd, __unused int isdgram,
/*
* nfs getattr service
*/
APPLESTATIC int
int
nfsrvd_getattr(struct nfsrv_descript *nd, int isdgram,
vnode_t vp, __unused struct nfsexstuff *exp)
{
@ -344,7 +344,7 @@ nfsrvd_getattr(struct nfsrv_descript *nd, int isdgram,
/*
* nfs setattr service
*/
APPLESTATIC int
int
nfsrvd_setattr(struct nfsrv_descript *nd, __unused int isdgram,
vnode_t vp, struct nfsexstuff *exp)
{
@ -558,7 +558,7 @@ nfsrvd_setattr(struct nfsrv_descript *nd, __unused int isdgram,
* nfs lookup rpc
* (Also performs lookup parent for v4)
*/
APPLESTATIC int
int
nfsrvd_lookup(struct nfsrv_descript *nd, __unused int isdgram,
vnode_t dp, vnode_t *vpp, fhandle_t *fhp, struct nfsexstuff *exp)
{
@ -658,7 +658,7 @@ nfsrvd_lookup(struct nfsrv_descript *nd, __unused int isdgram,
/*
* nfs readlink service
*/
APPLESTATIC int
int
nfsrvd_readlink(struct nfsrv_descript *nd, __unused int isdgram,
vnode_t vp, __unused struct nfsexstuff *exp)
{
@ -702,7 +702,7 @@ nfsrvd_readlink(struct nfsrv_descript *nd, __unused int isdgram,
/*
* nfs read service
*/
APPLESTATIC int
int
nfsrvd_read(struct nfsrv_descript *nd, __unused int isdgram,
vnode_t vp, struct nfsexstuff *exp)
{
@ -888,7 +888,7 @@ nfsrvd_read(struct nfsrv_descript *nd, __unused int isdgram,
/*
* nfs write service
*/
APPLESTATIC int
int
nfsrvd_write(struct nfsrv_descript *nd, __unused int isdgram,
vnode_t vp, struct nfsexstuff *exp)
{
@ -1070,7 +1070,7 @@ nfsrvd_write(struct nfsrv_descript *nd, __unused int isdgram,
* The core creation routine has been extracted out into nfsrv_creatsub(),
* so it can also be used by nfsrv_open() for V4.
*/
APPLESTATIC int
int
nfsrvd_create(struct nfsrv_descript *nd, __unused int isdgram,
vnode_t dp, struct nfsexstuff *exp)
{
@ -1240,7 +1240,7 @@ nfsrvd_create(struct nfsrv_descript *nd, __unused int isdgram,
/*
* nfs v3 mknod service (and v4 create)
*/
APPLESTATIC int
int
nfsrvd_mknod(struct nfsrv_descript *nd, __unused int isdgram,
vnode_t dp, vnode_t *vpp, fhandle_t *fhp, struct nfsexstuff *exp)
{
@ -1458,7 +1458,7 @@ nfsrvd_mknod(struct nfsrv_descript *nd, __unused int isdgram,
/*
* nfs remove service
*/
APPLESTATIC int
int
nfsrvd_remove(struct nfsrv_descript *nd, __unused int isdgram,
vnode_t dp, struct nfsexstuff *exp)
{
@ -1541,7 +1541,7 @@ nfsrvd_remove(struct nfsrv_descript *nd, __unused int isdgram,
/*
* nfs rename service
*/
APPLESTATIC int
int
nfsrvd_rename(struct nfsrv_descript *nd, int isdgram,
vnode_t dp, vnode_t todp, struct nfsexstuff *exp, struct nfsexstuff *toexp)
{
@ -1711,7 +1711,7 @@ nfsrvd_rename(struct nfsrv_descript *nd, int isdgram,
/*
* nfs link service
*/
APPLESTATIC int
int
nfsrvd_link(struct nfsrv_descript *nd, int isdgram,
vnode_t vp, vnode_t tovp, struct nfsexstuff *exp, struct nfsexstuff *toexp)
{
@ -1814,7 +1814,7 @@ nfsrvd_link(struct nfsrv_descript *nd, int isdgram,
/*
* nfs symbolic link service
*/
APPLESTATIC int
int
nfsrvd_symlink(struct nfsrv_descript *nd, __unused int isdgram,
vnode_t dp, vnode_t *vpp, fhandle_t *fhp, struct nfsexstuff *exp)
{
@ -1934,7 +1934,7 @@ nfsrvd_symlinksub(struct nfsrv_descript *nd, struct nameidata *ndp,
/*
* nfs mkdir service
*/
APPLESTATIC int
int
nfsrvd_mkdir(struct nfsrv_descript *nd, __unused int isdgram,
vnode_t dp, vnode_t *vpp, fhandle_t *fhp, struct nfsexstuff *exp)
{
@ -2068,7 +2068,7 @@ nfsrvd_mkdirsub(struct nfsrv_descript *nd, struct nameidata *ndp,
/*
* nfs commit service
*/
APPLESTATIC int
int
nfsrvd_commit(struct nfsrv_descript *nd, __unused int isdgram,
vnode_t vp, __unused struct nfsexstuff *exp)
{
@ -2126,7 +2126,7 @@ nfsrvd_commit(struct nfsrv_descript *nd, __unused int isdgram,
/*
* nfs statfs service
*/
APPLESTATIC int
int
nfsrvd_statfs(struct nfsrv_descript *nd, __unused int isdgram,
vnode_t vp, __unused struct nfsexstuff *exp)
{
@ -2186,7 +2186,7 @@ nfsrvd_statfs(struct nfsrv_descript *nd, __unused int isdgram,
/*
* nfs fsinfo service
*/
APPLESTATIC int
int
nfsrvd_fsinfo(struct nfsrv_descript *nd, int isdgram,
vnode_t vp, __unused struct nfsexstuff *exp)
{
@ -2226,7 +2226,7 @@ nfsrvd_fsinfo(struct nfsrv_descript *nd, int isdgram,
/*
* nfs pathconf service
*/
APPLESTATIC int
int
nfsrvd_pathconf(struct nfsrv_descript *nd, __unused int isdgram,
vnode_t vp, __unused struct nfsexstuff *exp)
{
@ -2278,7 +2278,7 @@ nfsrvd_pathconf(struct nfsrv_descript *nd, __unused int isdgram,
/*
* nfsv4 lock service
*/
APPLESTATIC int
int
nfsrvd_lock(struct nfsrv_descript *nd, __unused int isdgram,
vnode_t vp, struct nfsexstuff *exp)
{
@ -2506,7 +2506,7 @@ nfsrvd_lock(struct nfsrv_descript *nd, __unused int isdgram,
/*
* nfsv4 lock test service
*/
APPLESTATIC int
int
nfsrvd_lockt(struct nfsrv_descript *nd, __unused int isdgram,
vnode_t vp, struct nfsexstuff *exp)
{
@ -2621,7 +2621,7 @@ nfsrvd_lockt(struct nfsrv_descript *nd, __unused int isdgram,
/*
* nfsv4 unlock service
*/
APPLESTATIC int
int
nfsrvd_locku(struct nfsrv_descript *nd, __unused int isdgram,
vnode_t vp, struct nfsexstuff *exp)
{
@ -2737,7 +2737,7 @@ nfsrvd_locku(struct nfsrv_descript *nd, __unused int isdgram,
/*
* nfsv4 open service
*/
APPLESTATIC int
int
nfsrvd_open(struct nfsrv_descript *nd, __unused int isdgram,
vnode_t dp, vnode_t *vpp, __unused fhandle_t *fhp, struct nfsexstuff *exp)
{
@ -3216,7 +3216,7 @@ nfsrvd_open(struct nfsrv_descript *nd, __unused int isdgram,
/*
* nfsv4 close service
*/
APPLESTATIC int
int
nfsrvd_close(struct nfsrv_descript *nd, __unused int isdgram,
vnode_t vp, __unused struct nfsexstuff *exp)
{
@ -3297,7 +3297,7 @@ nfsrvd_close(struct nfsrv_descript *nd, __unused int isdgram,
/*
* nfsv4 delegpurge service
*/
APPLESTATIC int
int
nfsrvd_delegpurge(struct nfsrv_descript *nd, __unused int isdgram,
__unused vnode_t vp, __unused struct nfsexstuff *exp)
{
@ -3334,7 +3334,7 @@ nfsrvd_delegpurge(struct nfsrv_descript *nd, __unused int isdgram,
/*
* nfsv4 delegreturn service
*/
APPLESTATIC int
int
nfsrvd_delegreturn(struct nfsrv_descript *nd, __unused int isdgram,
vnode_t vp, __unused struct nfsexstuff *exp)
{
@ -3375,7 +3375,7 @@ nfsrvd_delegreturn(struct nfsrv_descript *nd, __unused int isdgram,
/*
* nfsv4 get file handle service
*/
APPLESTATIC int
int
nfsrvd_getfh(struct nfsrv_descript *nd, __unused int isdgram,
vnode_t vp, __unused struct nfsexstuff *exp)
{
@ -3393,7 +3393,7 @@ nfsrvd_getfh(struct nfsrv_descript *nd, __unused int isdgram,
/*
* nfsv4 open confirm service
*/
APPLESTATIC int
int
nfsrvd_openconfirm(struct nfsrv_descript *nd, __unused int isdgram,
vnode_t vp, __unused struct nfsexstuff *exp)
{
@ -3447,7 +3447,7 @@ nfsrvd_openconfirm(struct nfsrv_descript *nd, __unused int isdgram,
/*
* nfsv4 open downgrade service
*/
APPLESTATIC int
int
nfsrvd_opendowngrade(struct nfsrv_descript *nd, __unused int isdgram,
vnode_t vp, __unused struct nfsexstuff *exp)
{
@ -3558,7 +3558,7 @@ nfsrvd_opendowngrade(struct nfsrv_descript *nd, __unused int isdgram,
/*
* nfsv4 renew lease service
*/
APPLESTATIC int
int
nfsrvd_renew(struct nfsrv_descript *nd, __unused int isdgram,
__unused vnode_t vp, __unused struct nfsexstuff *exp)
{
@ -3599,7 +3599,7 @@ nfsrvd_renew(struct nfsrv_descript *nd, __unused int isdgram,
/*
* nfsv4 security info service
*/
APPLESTATIC int
int
nfsrvd_secinfo(struct nfsrv_descript *nd, int isdgram,
vnode_t dp, struct nfsexstuff *exp)
{
@ -3703,7 +3703,7 @@ nfsrvd_secinfo(struct nfsrv_descript *nd, int isdgram,
/*
* nfsv4 set client id service
*/
APPLESTATIC int
int
nfsrvd_setclientid(struct nfsrv_descript *nd, __unused int isdgram,
__unused vnode_t vp, __unused struct nfsexstuff *exp)
{
@ -3864,7 +3864,7 @@ nfsrvd_setclientid(struct nfsrv_descript *nd, __unused int isdgram,
/*
* nfsv4 set client id confirm service
*/
APPLESTATIC int
int
nfsrvd_setclientidcfrm(struct nfsrv_descript *nd,
__unused int isdgram, __unused vnode_t vp,
__unused struct nfsexstuff *exp)
@ -3902,7 +3902,7 @@ nfsrvd_setclientidcfrm(struct nfsrv_descript *nd,
/*
* nfsv4 verify service
*/
APPLESTATIC int
int
nfsrvd_verify(struct nfsrv_descript *nd, int isdgram,
vnode_t vp, __unused struct nfsexstuff *exp)
{
@ -3942,7 +3942,7 @@ nfsrvd_verify(struct nfsrv_descript *nd, int isdgram,
/*
* nfs openattr rpc
*/
APPLESTATIC int
int
nfsrvd_openattr(struct nfsrv_descript *nd, __unused int isdgram,
vnode_t dp, __unused vnode_t *vpp, __unused fhandle_t *fhp,
__unused struct nfsexstuff *exp)
@ -3962,7 +3962,7 @@ nfsrvd_openattr(struct nfsrv_descript *nd, __unused int isdgram,
/*
* nfsv4 release lock owner service
*/
APPLESTATIC int
int
nfsrvd_releaselckown(struct nfsrv_descript *nd, __unused int isdgram,
__unused vnode_t vp, __unused struct nfsexstuff *exp)
{
@ -4023,7 +4023,7 @@ nfsrvd_releaselckown(struct nfsrv_descript *nd, __unused int isdgram,
/*
* nfsv4 exchange_id service
*/
APPLESTATIC int
int
nfsrvd_exchangeid(struct nfsrv_descript *nd, __unused int isdgram,
__unused vnode_t vp, __unused struct nfsexstuff *exp)
{
@ -4189,7 +4189,7 @@ nfsrvd_exchangeid(struct nfsrv_descript *nd, __unused int isdgram,
/*
* nfsv4 create session service
*/
APPLESTATIC int
int
nfsrvd_createsession(struct nfsrv_descript *nd, __unused int isdgram,
__unused vnode_t vp, __unused struct nfsexstuff *exp)
{
@ -4302,7 +4302,7 @@ nfsrvd_createsession(struct nfsrv_descript *nd, __unused int isdgram,
/*
* nfsv4 sequence service
*/
APPLESTATIC int
int
nfsrvd_sequence(struct nfsrv_descript *nd, __unused int isdgram,
__unused vnode_t vp, __unused struct nfsexstuff *exp)
{
@ -4346,7 +4346,7 @@ nfsrvd_sequence(struct nfsrv_descript *nd, __unused int isdgram,
/*
* nfsv4 reclaim complete service
*/
APPLESTATIC int
int
nfsrvd_reclaimcomplete(struct nfsrv_descript *nd, __unused int isdgram,
__unused vnode_t vp, __unused struct nfsexstuff *exp)
{
@ -4379,7 +4379,7 @@ nfsrvd_reclaimcomplete(struct nfsrv_descript *nd, __unused int isdgram,
/*
* nfsv4 destroy clientid service
*/
APPLESTATIC int
int
nfsrvd_destroyclientid(struct nfsrv_descript *nd, __unused int isdgram,
__unused vnode_t vp, __unused struct nfsexstuff *exp)
{
@ -4404,7 +4404,7 @@ nfsrvd_destroyclientid(struct nfsrv_descript *nd, __unused int isdgram,
/*
* nfsv4 bind connection to session service
*/
APPLESTATIC int
int
nfsrvd_bindconnsess(struct nfsrv_descript *nd, __unused int isdgram,
__unused vnode_t vp, __unused struct nfsexstuff *exp)
{
@ -4443,7 +4443,7 @@ nfsrvd_bindconnsess(struct nfsrv_descript *nd, __unused int isdgram,
/*
* nfsv4 destroy session service
*/
APPLESTATIC int
int
nfsrvd_destroysession(struct nfsrv_descript *nd, __unused int isdgram,
__unused vnode_t vp, __unused struct nfsexstuff *exp)
{
@ -4465,7 +4465,7 @@ nfsrvd_destroysession(struct nfsrv_descript *nd, __unused int isdgram,
/*
* nfsv4 free stateid service
*/
APPLESTATIC int
int
nfsrvd_freestateid(struct nfsrv_descript *nd, __unused int isdgram,
__unused vnode_t vp, __unused struct nfsexstuff *exp)
{
@ -4513,7 +4513,7 @@ nfsrvd_freestateid(struct nfsrv_descript *nd, __unused int isdgram,
/*
* nfsv4 layoutget service
*/
APPLESTATIC int
int
nfsrvd_layoutget(struct nfsrv_descript *nd, __unused int isdgram,
vnode_t vp, struct nfsexstuff *exp)
{
@ -4611,7 +4611,7 @@ nfsrvd_layoutget(struct nfsrv_descript *nd, __unused int isdgram,
/*
* nfsv4 layoutcommit service
*/
APPLESTATIC int
int
nfsrvd_layoutcommit(struct nfsrv_descript *nd, __unused int isdgram,
vnode_t vp, struct nfsexstuff *exp)
{
@ -4697,7 +4697,7 @@ nfsrvd_layoutcommit(struct nfsrv_descript *nd, __unused int isdgram,
/*
* nfsv4 layoutreturn service
*/
APPLESTATIC int
int
nfsrvd_layoutreturn(struct nfsrv_descript *nd, __unused int isdgram,
vnode_t vp, struct nfsexstuff *exp)
{
@ -4783,7 +4783,7 @@ nfsrvd_layoutreturn(struct nfsrv_descript *nd, __unused int isdgram,
/*
* nfsv4 layout error service
*/
APPLESTATIC int
int
nfsrvd_layouterror(struct nfsrv_descript *nd, __unused int isdgram,
vnode_t vp, struct nfsexstuff *exp)
{
@ -4850,7 +4850,7 @@ nfsrvd_layouterror(struct nfsrv_descript *nd, __unused int isdgram,
/*
* nfsv4 layout stats service
*/
APPLESTATIC int
int
nfsrvd_layoutstats(struct nfsrv_descript *nd, __unused int isdgram,
vnode_t vp, struct nfsexstuff *exp)
{
@ -4912,7 +4912,7 @@ nfsrvd_layoutstats(struct nfsrv_descript *nd, __unused int isdgram,
/*
* nfsv4 io_advise service
*/
APPLESTATIC int
int
nfsrvd_ioadvise(struct nfsrv_descript *nd, __unused int isdgram,
vnode_t vp, struct nfsexstuff *exp)
{
@ -5006,7 +5006,7 @@ nfsrvd_ioadvise(struct nfsrv_descript *nd, __unused int isdgram,
/*
* nfsv4 getdeviceinfo service
*/
APPLESTATIC int
int
nfsrvd_getdevinfo(struct nfsrv_descript *nd, __unused int isdgram,
__unused vnode_t vp, __unused struct nfsexstuff *exp)
{
@ -5078,7 +5078,7 @@ nfsrvd_getdevinfo(struct nfsrv_descript *nd, __unused int isdgram,
/*
* nfsv4 test stateid service
*/
APPLESTATIC int
int
nfsrvd_teststateid(struct nfsrv_descript *nd, __unused int isdgram,
__unused vnode_t vp, __unused struct nfsexstuff *exp)
{
@ -5123,7 +5123,7 @@ nfsrvd_teststateid(struct nfsrv_descript *nd, __unused int isdgram,
/*
* nfs allocate service
*/
APPLESTATIC int
int
nfsrvd_allocate(struct nfsrv_descript *nd, __unused int isdgram,
vnode_t vp, struct nfsexstuff *exp)
{
@ -5216,7 +5216,7 @@ nfsrvd_allocate(struct nfsrv_descript *nd, __unused int isdgram,
/*
* nfs copy service
*/
APPLESTATIC int
int
nfsrvd_copy_file_range(struct nfsrv_descript *nd, __unused int isdgram,
vnode_t vp, vnode_t tovp, struct nfsexstuff *exp, struct nfsexstuff *toexp)
{
@ -5452,7 +5452,7 @@ nfsrvd_copy_file_range(struct nfsrv_descript *nd, __unused int isdgram,
/*
* nfs seek service
*/
APPLESTATIC int
int
nfsrvd_seek(struct nfsrv_descript *nd, __unused int isdgram,
vnode_t vp, struct nfsexstuff *exp)
{
@ -5525,7 +5525,7 @@ nfsrvd_seek(struct nfsrv_descript *nd, __unused int isdgram,
/*
* nfs get extended attribute service
*/
APPLESTATIC int
int
nfsrvd_getxattr(struct nfsrv_descript *nd, __unused int isdgram,
vnode_t vp, __unused struct nfsexstuff *exp)
{
@ -5581,7 +5581,7 @@ nfsrvd_getxattr(struct nfsrv_descript *nd, __unused int isdgram,
/*
* nfs set extended attribute service
*/
APPLESTATIC int
int
nfsrvd_setxattr(struct nfsrv_descript *nd, __unused int isdgram,
vnode_t vp, __unused struct nfsexstuff *exp)
{
@ -5675,7 +5675,7 @@ nfsrvd_setxattr(struct nfsrv_descript *nd, __unused int isdgram,
/*
* nfs remove extended attribute service
*/
APPLESTATIC int
int
nfsrvd_rmxattr(struct nfsrv_descript *nd, __unused int isdgram,
vnode_t vp, __unused struct nfsexstuff *exp)
{
@ -5745,7 +5745,7 @@ nfsrvd_rmxattr(struct nfsrv_descript *nd, __unused int isdgram,
/*
* nfs list extended attribute service
*/
APPLESTATIC int
int
nfsrvd_listxattr(struct nfsrv_descript *nd, __unused int isdgram,
vnode_t vp, __unused struct nfsexstuff *exp)
{
@ -5857,7 +5857,7 @@ nfsrvd_listxattr(struct nfsrv_descript *nd, __unused int isdgram,
/*
* nfsv4 service not supported
*/
APPLESTATIC int
int
nfsrvd_notsupp(struct nfsrv_descript *nd, __unused int isdgram,
__unused vnode_t vp, __unused struct nfsexstuff *exp)
{

2
sys/fs/nfsserver/nfs_nfsdsocket.c
View File

@ -529,7 +529,7 @@ nfsrvd_statend(int op, uint64_t bytes, struct bintime *now,
* handle plus name or ...
* The NFS V4 Compound RPC is performed separately by nfsrvd_compound().
*/
APPLESTATIC void
void
nfsrvd_dorpc(struct nfsrv_descript *nd, int isdgram, u_char *tag, int taglen,
u_int32_t minorvers)
{

56
sys/fs/nfsserver/nfs_nfsdstate.c
View File

@ -240,7 +240,7 @@ static struct nfsdevice *nfsrv_findmirroredds(struct nfsmount *nmp);
* If returning a non-error, the clp structure must either be linked into
* the client list or free'd.
*/
APPLESTATIC int
int
nfsrv_setclient(struct nfsrv_descript *nd, struct nfsclient **new_clpp,
nfsquad_t *clientidp, nfsquad_t *confirmp, NFSPROC_T *p)
{
@ -581,7 +581,7 @@ nfsrv_setclient(struct nfsrv_descript *nd, struct nfsclient **new_clpp,
/*
* Check to see if the client id exists and optionally confirm it.
*/
APPLESTATIC int
int
nfsrv_getclient(nfsquad_t clientid, int opflags, struct nfsclient **clpp,
struct nfsdsession *nsep, nfsquad_t confirm, uint32_t cbprogram,
struct nfsrv_descript *nd, NFSPROC_T *p)
@ -864,7 +864,7 @@ nfsrv_destroyclient(nfsquad_t clientid, NFSPROC_T *p)
* Called from the new nfssvc syscall to admin revoke a clientid.
* Returns 0 for success, error otherwise.
*/
APPLESTATIC int
int
nfsrv_adminrevoke(struct nfsd_clid *revokep, NFSPROC_T *p)
{
struct nfsclient *clp = NULL;
@ -932,7 +932,7 @@ nfsrv_adminrevoke(struct nfsd_clid *revokep, NFSPROC_T *p)
* Dump out stats for all clients. Called from nfssvc(2), that is used
* nfsstatsv1.
*/
APPLESTATIC void
void
nfsrv_dumpclients(struct nfsd_dumpclients *dumpp, int maxcnt)
{
struct nfsclient *clp;
@ -1035,7 +1035,7 @@ nfsrv_dumpaclient(struct nfsclient *clp, struct nfsd_dumpclients *dumpp)
/*
* Dump out lock stats for a file.
*/
APPLESTATIC void
void
nfsrv_dumplocks(vnode_t vp, struct nfsd_dumplocks *ldumpp, int maxcnt,
NFSPROC_T *p)
{
@ -1208,7 +1208,7 @@ nfsrv_dumplocks(vnode_t vp, struct nfsd_dumplocks *ldumpp, int maxcnt,
* Darwin, I'm not sure what will work correctly yet.)
* Should be called once per second.
*/
APPLESTATIC void
void
nfsrv_servertimer(void)
{
struct nfsclient *clp, *nclp;
@ -1333,7 +1333,7 @@ nfsrv_servertimer(void)
* Caller must hold an exclusive lock on nfsv4rootfs_lock, so that
* there are no other active nfsd threads.
*/
APPLESTATIC void
void
nfsrv_cleanclient(struct nfsclient *clp, NFSPROC_T *p)
{
struct nfsstate *stp, *nstp;
@ -1352,7 +1352,7 @@ nfsrv_cleanclient(struct nfsclient *clp, NFSPROC_T *p)
* (Just to be safe w.r.t. newnfs_disconnect(), call this function when
* softclock interrupts are enabled.)
*/
APPLESTATIC void
void
nfsrv_zapclient(struct nfsclient *clp, NFSPROC_T *p)
{
@ -1384,7 +1384,7 @@ nfsrv_zapclient(struct nfsclient *clp, NFSPROC_T *p)
* (This function will also free all nfslockfile structures that no
* longer have associated state.)
*/
APPLESTATIC void
void
nfsrv_freedeleglist(struct nfsstatehead *sthp)
{
struct nfsstate *stp, *nstp;
@ -1668,7 +1668,7 @@ nfsrv_getowner(struct nfsstatehead *hp, struct nfsstate *new_stp,
* cases, *new_stpp and *new_lopp should be malloc'd before the call,
* in case they are used.
*/
APPLESTATIC int
int
nfsrv_lockctrl(vnode_t vp, struct nfsstate **new_stpp,
struct nfslock **new_lopp, struct nfslockconflict *cfp,
nfsquad_t clientid, nfsv4stateid_t *stateidp,
@ -2391,7 +2391,7 @@ nfsrv_lockctrl(vnode_t vp, struct nfsstate **new_stpp,
* repstat is passed back out as an error if more critical errors
* are not detected.
*/
APPLESTATIC int
int
nfsrv_opencheck(nfsquad_t clientid, nfsv4stateid_t *stateidp,
struct nfsstate *new_stp, vnode_t vp, struct nfsrv_descript *nd,
NFSPROC_T *p, int repstat)
@ -2642,7 +2642,7 @@ nfsrv_opencheck(nfsquad_t clientid, nfsv4stateid_t *stateidp,
/*
* Open control function to create/update open state for an open.
*/
APPLESTATIC int
int
nfsrv_openctrl(struct nfsrv_descript *nd, vnode_t vp,
struct nfsstate **new_stpp, nfsquad_t clientid, nfsv4stateid_t *stateidp,
nfsv4stateid_t *delegstateidp, u_int32_t *rflagsp, struct nfsexstuff *exp,
@ -3408,7 +3408,7 @@ nfsrv_openctrl(struct nfsrv_descript *nd, vnode_t vp,
/*
* Open update. Does the confirm, downgrade and close.
*/
APPLESTATIC int
int
nfsrv_openupdate(vnode_t vp, struct nfsstate *new_stp, nfsquad_t clientid,
nfsv4stateid_t *stateidp, struct nfsrv_descript *nd, NFSPROC_T *p,
int *retwriteaccessp)
@ -3572,7 +3572,7 @@ nfsrv_openupdate(vnode_t vp, struct nfsstate *new_stp, nfsquad_t clientid,
/*
* Delegation update. Does the purge and return.
*/
APPLESTATIC int
int
nfsrv_delegupdate(struct nfsrv_descript *nd, nfsquad_t clientid,
nfsv4stateid_t *stateidp, vnode_t vp, int op, struct ucred *cred,
NFSPROC_T *p, int *retwriteaccessp)
@ -3661,7 +3661,7 @@ nfsrv_delegupdate(struct nfsrv_descript *nd, nfsquad_t clientid,
/*
* Release lock owner.
*/
APPLESTATIC int
int
nfsrv_releaselckown(struct nfsstate *new_stp, nfsquad_t clientid,
NFSPROC_T *p)
{
@ -4047,7 +4047,7 @@ nfsrv_checkseqid(struct nfsrv_descript *nd, u_int32_t seqid,
* for callbacks, but can be printed out by nfsstats for info.)
* Return error if the xdr can't be parsed, 0 otherwise.
*/
APPLESTATIC int
int
nfsrv_getclientipaddr(struct nfsrv_descript *nd, struct nfsclient *clp)
{
u_int32_t *tl;
@ -4802,7 +4802,7 @@ nfsrv_nextstateindex(struct nfsclient *clp)
* Read in the stable storage file. Called by nfssvc() before the nfsd
* processes start servicing requests.
*/
APPLESTATIC void
void
nfsrv_setupstable(NFSPROC_T *p)
{
struct nfsrv_stablefirst *sf = &nfsrv_stablefirst;
@ -4937,7 +4937,7 @@ nfsrv_setupstable(NFSPROC_T *p)
/*
* Update the stable storage file, now that the grace period is over.
*/
APPLESTATIC void
void
nfsrv_updatestable(NFSPROC_T *p)
{
struct nfsrv_stablefirst *sf = &nfsrv_stablefirst;
@ -5020,7 +5020,7 @@ nfsrv_updatestable(NFSPROC_T *p)
/*
* Append a record to the stable storage file.
*/
APPLESTATIC void
void
nfsrv_writestable(u_char *client, int len, int flag, NFSPROC_T *p)
{
struct nfsrv_stablefirst *sf = &nfsrv_stablefirst;
@ -5388,7 +5388,7 @@ nfsrv_delegconflict(struct nfsstate *stp, int *haslockp, NFSPROC_T *p,
* Check for a remove allowed, if remove is set to 1 and get rid of
* delegations.
*/
APPLESTATIC int
int
nfsrv_checkremove(vnode_t vp, int remove, struct nfsrv_descript *nd,
nfsquad_t clientid, NFSPROC_T *p)
{
@ -5533,7 +5533,7 @@ nfsrv_cleandeleg(vnode_t vp, struct nfslockfile *lfp,
* and all delegations for the vnode recalled. This is done via the
* second function, using the VV_DISABLEDELEG vflag on the vnode.
*/
APPLESTATIC void
void
nfsd_recalldelegation(vnode_t vp, NFSPROC_T *p)
{
time_t starttime;
@ -5580,7 +5580,7 @@ nfsd_recalldelegation(vnode_t vp, NFSPROC_T *p)
NFSUNLOCKV4ROOTMUTEX();
}
APPLESTATIC void
void
nfsd_disabledelegation(vnode_t vp, NFSPROC_T *p)
{
@ -5610,7 +5610,7 @@ nfsd_disabledelegation(vnode_t vp, NFSPROC_T *p)
* as Write backs, even if there is no delegation, so it really isn't any
* different?)
*/
APPLESTATIC int
int
nfsrv_checksetattr(vnode_t vp, struct nfsrv_descript *nd,
nfsv4stateid_t *stateidp, struct nfsvattr *nvap, nfsattrbit_t *attrbitp,
struct nfsexstuff *exp, NFSPROC_T *p)
@ -5657,7 +5657,7 @@ nfsrv_checksetattr(vnode_t vp, struct nfsrv_descript *nd,
* Should I return an error if I can't get the attributes? (For now, I'll
* just return ok.
*/
APPLESTATIC int
int
nfsrv_checkgetattr(struct nfsrv_descript *nd, vnode_t vp,
struct nfsvattr *nvap, nfsattrbit_t *attrbitp, NFSPROC_T *p)
{
@ -5763,7 +5763,7 @@ nfsrv_checkgetattr(struct nfsrv_descript *nd, vnode_t vp,
* a while and throws them away. Called by an nfsd when NFSNSF_NOOPENS
* is set.
*/
APPLESTATIC void
void
nfsrv_throwawayopens(NFSPROC_T *p)
{
struct nfsclient *clp, *nclp;
@ -6654,7 +6654,7 @@ nfsv4_getcbsession(struct nfsclient *clp, struct nfsdsession **sepp)
* This is only called after all the nfsd threads are done performing RPCs,
* so locking shouldn't be an issue.
*/
APPLESTATIC void
void
nfsrv_freeallbackchannel_xprts(void)
{
struct nfsdsession *sep;
@ -7795,7 +7795,7 @@ nfsrv_deldsnmp(int op, struct nfsmount *nmp, NFSPROC_T *p)
* point.
* Also, returns an error instead of the nfsdevice found.
*/
APPLESTATIC int
int
nfsrv_delds(char *devid, NFSPROC_T *p)
{
struct nfsdevice *ds, *fndds;
@ -8051,7 +8051,7 @@ nfsrv_freealldevids(void)
* Getattr RPC to the Data Server (DS) is necessary.
*/
#define NFSCLIDVECSIZE 6
APPLESTATIC int
int
nfsrv_checkdsattr(vnode_t vp, NFSPROC_T *p)
{
fhandle_t fh, *tfhp;

22
sys/fs/nfsserver/nfs_nfsdsubs.c
View File

@ -1271,7 +1271,7 @@ static short *nfsrv_v4errmap[] = {
* A fiddled version of m_adj() that ensures null fill to a long
* boundary and only trims off the back end
*/
APPLESTATIC void
void
nfsrv_adj(struct mbuf *mp, int len, int nul)
{
struct mbuf *m;
@ -1330,7 +1330,7 @@ nfsrv_adj(struct mbuf *mp, int len, int nul)
* Make these functions instead of macros, so that the kernel text size
* doesn't get too big...
*/
APPLESTATIC void
void
nfsrv_wcc(struct nfsrv_descript *nd, int before_ret,
struct nfsvattr *before_nvap, int after_ret, struct nfsvattr *after_nvap)
{
@ -1351,7 +1351,7 @@ nfsrv_wcc(struct nfsrv_descript *nd, int before_ret,
nfsrv_postopattr(nd, after_ret, after_nvap);
}
APPLESTATIC void
void
nfsrv_postopattr(struct nfsrv_descript *nd, int after_ret,
struct nfsvattr *after_nvap)
{
@ -1370,7 +1370,7 @@ nfsrv_postopattr(struct nfsrv_descript *nd, int after_ret,
* Fill in file attributes for V2 and 3. For V4, call a separate
* routine that sifts through all the attribute bits.
*/
APPLESTATIC void
void
nfsrv_fillattr(struct nfsrv_descript *nd, struct nfsvattr *nvap)
{
struct nfs_fattr *fp;
@ -1429,7 +1429,7 @@ nfsrv_fillattr(struct nfsrv_descript *nd, struct nfsvattr *nvap)
* the public file handle.
* For NFSv4, if the length is incorrect, set nd_repstat == NFSERR_BADHANDLE
*/
APPLESTATIC int
int
nfsrv_mtofh(struct nfsrv_descript *nd, struct nfsrvfh *fhp)
{
u_int32_t *tl;
@ -1498,7 +1498,7 @@ nfsrv_mtofh(struct nfsrv_descript *nd, struct nfsrvfh *fhp)
* RPC procedure is not involved.
* Returns the error number in XDR.
*/
APPLESTATIC int
int
nfsd_errmap(struct nfsrv_descript *nd)
{
short *defaulterrp, *errp;
@ -1554,7 +1554,7 @@ nfsrv_isannfserr(u_int32_t errval)
* file object. (Called when uid and/or gid is specified in the
* settable attributes for V4.
*/
APPLESTATIC int
int
nfsrv_checkuidgid(struct nfsrv_descript *nd, struct nfsvattr *nvap)
{
int error = 0;
@ -1587,7 +1587,7 @@ nfsrv_checkuidgid(struct nfsrv_descript *nd, struct nfsvattr *nvap)
* and this routine fixes up the settable attributes for V4 if allowed
* by nfsrv_checkuidgid().
*/
APPLESTATIC void
void
nfsrv_fixattr(struct nfsrv_descript *nd, vnode_t vp,
struct nfsvattr *nvap, NFSACL_T *aclp, NFSPROC_T *p, nfsattrbit_t *attrbitp,
struct nfsexstuff *exp)
@ -1695,7 +1695,7 @@ nfsrv_hexdigit(char c, int *err)
* Check to see if NFSERR_MOVED can be returned for this op. Return 1 iff
* it can be.
*/
APPLESTATIC int
int
nfsrv_errmoved(int op)
{
short *errp;
@ -1713,7 +1713,7 @@ nfsrv_errmoved(int op)
* Fill in attributes for a Referral.
* (Return the number of bytes of XDR created.)
*/
APPLESTATIC int
int
nfsrv_putreferralattr(struct nfsrv_descript *nd, nfsattrbit_t *retbitp,
struct nfsreferral *refp, int getattr, int *reterrp)
{
@ -1831,7 +1831,7 @@ nfsrv_putreferralattr(struct nfsrv_descript *nd, nfsattrbit_t *retbitp,
/*
* Parse a file name out of a request.
*/
APPLESTATIC int
int
nfsrv_parsename(struct nfsrv_descript *nd, char *bufp, u_long *hashp,
NFSPATHLEN_T *outlenp)
{