nfscl: Clean up the code by removing #if(n)def APPLE
The definition of "APPLE" was used by the Mac OSX port. For FreeBSD, this definition is never used, so remove the references to it to clean up the code. This commit should not result in a semantics change.
This commit is contained in:
parent
8c309d48aa
commit
6d25ea6d96
@ -625,7 +625,6 @@ nfscl_fillsattr(struct nfsrv_descript *nd, struct vattr *vap,
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifndef APPLE
|
|
||||||
/*
|
/*
|
||||||
* copies mbuf chain to the uio scatter/gather list
|
* copies mbuf chain to the uio scatter/gather list
|
||||||
*/
|
*/
|
||||||
@ -706,7 +705,6 @@ nfsm_mbufuio(struct nfsrv_descript *nd, struct uio *uiop, int siz)
|
|||||||
NFSEXITCODE2(error, nd);
|
NFSEXITCODE2(error, nd);
|
||||||
return (error);
|
return (error);
|
||||||
}
|
}
|
||||||
#endif /* !APPLE */
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Help break down an mbuf chain by setting the first siz bytes contiguous
|
* Help break down an mbuf chain by setting the first siz bytes contiguous
|
||||||
@ -2531,7 +2529,6 @@ nfsv4_fillattr(struct nfsrv_descript *nd, struct mount *mp, vnode_t vp,
|
|||||||
aclp = naclp;
|
aclp = naclp;
|
||||||
}
|
}
|
||||||
nfsvno_getfs(&fsinf, isdgram);
|
nfsvno_getfs(&fsinf, isdgram);
|
||||||
#ifndef APPLE
|
|
||||||
/*
|
/*
|
||||||
* Get the VFS_STATFS(), since some attributes need them.
|
* Get the VFS_STATFS(), since some attributes need them.
|
||||||
*/
|
*/
|
||||||
@ -2558,7 +2555,6 @@ nfsv4_fillattr(struct nfsrv_descript *nd, struct mount *mp, vnode_t vp,
|
|||||||
if (fs->f_ffree < 0)
|
if (fs->f_ffree < 0)
|
||||||
fs->f_ffree = 0;
|
fs->f_ffree = 0;
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* And the NFSv4 ACL...
|
* And the NFSv4 ACL...
|
||||||
|
@ -43,7 +43,6 @@
|
|||||||
* other purpose will be dangerous. (they make weird assumptions)
|
* other purpose will be dangerous. (they make weird assumptions)
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef APPLE
|
|
||||||
/*
|
/*
|
||||||
* First define what the actual subs. return
|
* First define what the actual subs. return
|
||||||
*/
|
*/
|
||||||
@ -142,7 +141,6 @@ nfsm_dissect_nonblock(struct nfsrv_descript *nd, int siz)
|
|||||||
goto nfsmout; \
|
goto nfsmout; \
|
||||||
} \
|
} \
|
||||||
} while (0)
|
} while (0)
|
||||||
#endif /* !APPLE */
|
|
||||||
|
|
||||||
#define NFSM_STRSIZ(s, m) \
|
#define NFSM_STRSIZ(s, m) \
|
||||||
do { \
|
do { \
|
||||||
|
@ -425,9 +425,6 @@ else printf(" fhl=0\n");
|
|||||||
NFS4NODENAME(np->n_v4),
|
NFS4NODENAME(np->n_v4),
|
||||||
np->n_v4->n4_namelen, &dp, cred, p);
|
np->n_v4->n4_namelen, &dp, cred, p);
|
||||||
if (dp != NULL) {
|
if (dp != NULL) {
|
||||||
#ifdef APPLE
|
|
||||||
OSBitAndAtomic((int32_t)~NDELEGMOD, (UInt32 *)&np->n_flag);
|
|
||||||
#else
|
|
||||||
NFSLOCKNODE(np);
|
NFSLOCKNODE(np);
|
||||||
np->n_flag &= ~NDELEGMOD;
|
np->n_flag &= ~NDELEGMOD;
|
||||||
/*
|
/*
|
||||||
@ -439,7 +436,6 @@ else printf(" fhl=0\n");
|
|||||||
*/
|
*/
|
||||||
NFSINVALATTRCACHE(np);
|
NFSINVALATTRCACHE(np);
|
||||||
NFSUNLOCKNODE(np);
|
NFSUNLOCKNODE(np);
|
||||||
#endif
|
|
||||||
(void) nfscl_deleg(nmp->nm_mountp,
|
(void) nfscl_deleg(nmp->nm_mountp,
|
||||||
op->nfso_own->nfsow_clp,
|
op->nfso_own->nfsow_clp,
|
||||||
nfhp->nfh_fh, nfhp->nfh_len, cred, p, &dp);
|
nfhp->nfh_fh, nfhp->nfh_len, cred, p, &dp);
|
||||||
@ -3645,7 +3641,6 @@ nfsrpc_readdir(vnode_t vp, struct uio *uiop, nfsuint64 *cookiep,
|
|||||||
return (error);
|
return (error);
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifndef APPLE
|
|
||||||
/*
|
/*
|
||||||
* NFS V3 readdir plus RPC. Used in place of nfsrpc_readdir().
|
* NFS V3 readdir plus RPC. Used in place of nfsrpc_readdir().
|
||||||
* (Also used for NFS V4 when mount flag set.)
|
* (Also used for NFS V4 when mount flag set.)
|
||||||
@ -4181,7 +4176,6 @@ nfsrpc_readdirplus(vnode_t vp, struct uio *uiop, nfsuint64 *cookiep,
|
|||||||
m_freem(nd->nd_mrep);
|
m_freem(nd->nd_mrep);
|
||||||
return (error);
|
return (error);
|
||||||
}
|
}
|
||||||
#endif /* !APPLE */
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Nfs commit rpc
|
* Nfs commit rpc
|
||||||
|
Loading…
Reference in New Issue
Block a user