diff options
Diffstat (limited to 'sys/nfs')
| -rw-r--r-- | sys/nfs/nfs.h | 8 | ||||
| -rw-r--r-- | sys/nfs/nfsmount.h | 4 | ||||
| -rw-r--r-- | sys/nfs/nfsnode.h | 6 | ||||
| -rw-r--r-- | sys/nfs/nqnfs.h | 2 |
4 files changed, 10 insertions, 10 deletions
diff --git a/sys/nfs/nfs.h b/sys/nfs/nfs.h index 75a3982..2d009a1 100644 --- a/sys/nfs/nfs.h +++ b/sys/nfs/nfs.h @@ -40,7 +40,7 @@ #ifndef _NFS_NFS_H_ #define _NFS_NFS_H_ -#ifdef KERNEL +#ifdef _KERNEL #include "opt_nfs.h" #endif @@ -83,7 +83,7 @@ #define NFS_GATHERDELAY 10 /* Default write gather delay (msec) */ #endif #define NFS_DIRBLKSIZ 4096 /* Must be a multiple of DIRBLKSIZ */ -#ifdef KERNEL +#ifdef _KERNEL #define DIRBLKSIZ 512 /* XXX we used to use ufs's DIRBLKSIZ */ #endif @@ -299,7 +299,7 @@ struct nfsstats { { "nfsprivport", CTLTYPE_INT }, \ } -#ifdef KERNEL +#ifdef _KERNEL #ifdef MALLOC_DECLARE MALLOC_DECLARE(M_NFSREQ); @@ -734,6 +734,6 @@ int nfsrv_write __P((struct nfsrv_descript *nfsd, struct nfssvc_sock *slp, struct proc *procp, struct mbuf **mrq)); void nfsrv_rcv __P((struct socket *so, void *arg, int waitflag)); void nfsrv_slpderef __P((struct nfssvc_sock *slp)); -#endif /* KERNEL */ +#endif /* _KERNEL */ #endif diff --git a/sys/nfs/nfsmount.h b/sys/nfs/nfsmount.h index 77ac7e3..8efd1df 100644 --- a/sys/nfs/nfsmount.h +++ b/sys/nfs/nfsmount.h @@ -95,12 +95,12 @@ struct nfsmount { u_int64_t nm_maxfilesize; /* maximum file size */ }; -#if defined(KERNEL) || defined(_KERNEL) +#if defined(_KERNEL) /* * Convert mount ptr to nfsmount ptr. */ #define VFSTONFS(mp) ((struct nfsmount *)((mp)->mnt_data)) -#endif /* KERNEL */ +#endif #endif diff --git a/sys/nfs/nfsnode.h b/sys/nfs/nfsnode.h index e654bc0..dac6020 100644 --- a/sys/nfs/nfsnode.h +++ b/sys/nfs/nfsnode.h @@ -41,7 +41,7 @@ #ifndef _NFS_NFSNODE_H_ #define _NFS_NFSNODE_H_ -#if !defined(_NFS_NFS_H_) && !defined(KERNEL) +#if !defined(_NFS_NFS_H_) && !defined(_KERNEL) #include <nfs/nfs.h> #endif @@ -157,7 +157,7 @@ extern TAILQ_HEAD(nfs_bufq, buf) nfs_bufq; extern struct proc *nfs_iodwant[NFS_MAXASYNCDAEMON]; extern struct nfsmount *nfs_iodmount[NFS_MAXASYNCDAEMON]; -#if defined(KERNEL) || defined(_KERNEL) +#if defined(_KERNEL) /* * nfs_rslock - Attempt to obtain lock on nfsnode @@ -205,6 +205,6 @@ void nfs_invaldir __P((struct vnode *)); #define nqnfs_lease_updatetime nfs_lease_updatetime -#endif /* KERNEL */ +#endif /* _KERNEL */ #endif diff --git a/sys/nfs/nqnfs.h b/sys/nfs/nqnfs.h index 2ba78ae..9afe58d 100644 --- a/sys/nfs/nqnfs.h +++ b/sys/nfs/nqnfs.h @@ -62,7 +62,7 @@ #define NQNFS_VER3 3 #define NQNFS_EVICTSIZ 156 /* Size of eviction request in bytes */ -#if defined(KERNEL) || defined(_KERNEL) +#if defined(_KERNEL) /* * Definitions used for saving the "last lease expires" time in Non-volatile * RAM on the server. The default definitions below assume that NOVRAM is not |
