diff options
| author | msmith <msmith@FreeBSD.org> | 2002-01-08 19:41:06 +0000 |
|---|---|---|
| committer | msmith <msmith@FreeBSD.org> | 2002-01-08 19:41:06 +0000 |
| commit | 7f06d73491446372d0b659886c6da537a5e67bc0 (patch) | |
| tree | 475ccd5e68c8b58f75161b23c9c51920fe7bc876 /sys/nfsserver/nfs.h | |
| parent | cb52de758f82c925fb6321f89fe6af8a6c1b83bb (diff) | |
| download | FreeBSD-src-7f06d73491446372d0b659886c6da537a5e67bc0.zip FreeBSD-src-7f06d73491446372d0b659886c6da537a5e67bc0.tar.gz | |
Rename some variables that end up shadowing their namesakes in the NFS client
code.
Reviewed by: peter
Diffstat (limited to 'sys/nfsserver/nfs.h')
| -rw-r--r-- | sys/nfsserver/nfs.h | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/sys/nfsserver/nfs.h b/sys/nfsserver/nfs.h index 610201b..25ab85d 100644 --- a/sys/nfsserver/nfs.h +++ b/sys/nfsserver/nfs.h @@ -158,18 +158,21 @@ struct nameidata; extern struct callout_handle nfsrv_timer_handle; extern struct nfsrvstats nfsrvstats; -extern int nfs_ticks; +extern int nfsrv_ticks; extern int nfsrvw_procrastinate; extern int nfsrvw_procrastinate_v3; /* Various values converted to XDR form. */ -extern u_int32_t nfs_false, nfs_true, nfs_xdrneg1, nfs_prog; -extern u_int32_t rpc_reply, rpc_msgdenied, rpc_mismatch, rpc_vers; -extern u_int32_t rpc_auth_unix, rpc_msgaccepted, rpc_call, rpc_autherr; +extern u_int32_t nfsrv_nfs_false, nfsrv_nfs_true, nfsrv_nfs_xdrneg1, + nfsrv_nfs_prog; +extern u_int32_t nfsrv_rpc_reply, nfsrv_rpc_msgdenied, nfsrv_rpc_mismatch, + nfsrv_rpc_vers; +extern u_int32_t nfsrv_rpc_auth_unix, nfsrv_rpc_msgaccepted, nfsrv_rpc_call, + nfsrv_rpc_autherr; /* Procedure table data */ extern int nfsrvv2_procid[NFS_NPROCS]; -extern int nfsv3_procid[NFS_NPROCS]; +extern int nfsrv_nfsv3_procid[NFS_NPROCS]; extern int32_t (*nfsrv3_procs[NFS_NPROCS])(struct nfsrv_descript *nd, struct nfssvc_sock *slp, struct thread *td, struct mbuf **mreqp); |
