aboutsummaryrefslogtreecommitdiff
path: root/sys/nfsclient
diff options
context:
space:
mode:
authorPeter Wemm <peter@FreeBSD.org>2001-09-15 04:41:56 +0000
committerPeter Wemm <peter@FreeBSD.org>2001-09-15 04:41:56 +0000
commit38f48395d614d7e069b8064d3311eaa366987c85 (patch)
treeb666113441f139b3cd7ec89faeefbc9b45f80305 /sys/nfsclient
parentcd6cd68d18bcce56750662dfa3f7a1154152cc0e (diff)
downloadsrc-38f48395d614d7e069b8064d3311eaa366987c85.tar.gz
src-38f48395d614d7e069b8064d3311eaa366987c85.zip
Sync some differences that were different between the copies of the files
that were in nfs/nfs.h and nfsserver/nfs.h in the p4 tree.
Notes
Notes: svn path=/head/; revision=83493
Diffstat (limited to 'sys/nfsclient')
-rw-r--r--sys/nfsclient/nfs.h6
-rw-r--r--sys/nfsclient/nfsargs.h6
-rw-r--r--sys/nfsclient/nfsstats.h6
3 files changed, 9 insertions, 9 deletions
diff --git a/sys/nfsclient/nfs.h b/sys/nfsclient/nfs.h
index d5d0796245d2..da808f4bf675 100644
--- a/sys/nfsclient/nfs.h
+++ b/sys/nfsclient/nfs.h
@@ -348,7 +348,7 @@ struct nfsreq {
int r_timer; /* tick counter on reply */
u_int32_t r_procnum; /* NFS procedure number */
int r_rtt; /* RTT for rpc */
- struct thread *r_td; /* Proc that did I/O system call */
+ struct thread *r_td; /* Proc that did I/O system call */
};
/*
@@ -598,7 +598,7 @@ int nfs_readrpc __P((struct vnode *, struct uio *, struct ucred *));
int nfs_writerpc __P((struct vnode *, struct uio *, struct ucred *, int *,
int *));
int nfs_commit __P((struct vnode *vp, u_quad_t offset, int cnt,
- struct ucred *cred, struct thread *));
+ struct ucred *cred, struct thread *td));
int nfs_readdirrpc __P((struct vnode *, struct uio *, struct ucred *));
int nfs_asyncio __P((struct buf *, struct ucred *, struct thread *));
int nfs_doio __P((struct buf *, struct ucred *, struct thread *));
@@ -658,7 +658,7 @@ void nfsrv_wakenfsd __P((struct nfssvc_sock *slp));
int nfsrv_writegather __P((struct nfsrv_descript **, struct nfssvc_sock *,
struct thread *, struct mbuf **));
int nfs_fsinfo __P((struct nfsmount *, struct vnode *, struct ucred *,
- struct thread *p));
+ struct thread *td));
int nfsrv3_access __P((struct nfsrv_descript *nfsd,
struct nfssvc_sock *slp,
diff --git a/sys/nfsclient/nfsargs.h b/sys/nfsclient/nfsargs.h
index d5d0796245d2..da808f4bf675 100644
--- a/sys/nfsclient/nfsargs.h
+++ b/sys/nfsclient/nfsargs.h
@@ -348,7 +348,7 @@ struct nfsreq {
int r_timer; /* tick counter on reply */
u_int32_t r_procnum; /* NFS procedure number */
int r_rtt; /* RTT for rpc */
- struct thread *r_td; /* Proc that did I/O system call */
+ struct thread *r_td; /* Proc that did I/O system call */
};
/*
@@ -598,7 +598,7 @@ int nfs_readrpc __P((struct vnode *, struct uio *, struct ucred *));
int nfs_writerpc __P((struct vnode *, struct uio *, struct ucred *, int *,
int *));
int nfs_commit __P((struct vnode *vp, u_quad_t offset, int cnt,
- struct ucred *cred, struct thread *));
+ struct ucred *cred, struct thread *td));
int nfs_readdirrpc __P((struct vnode *, struct uio *, struct ucred *));
int nfs_asyncio __P((struct buf *, struct ucred *, struct thread *));
int nfs_doio __P((struct buf *, struct ucred *, struct thread *));
@@ -658,7 +658,7 @@ void nfsrv_wakenfsd __P((struct nfssvc_sock *slp));
int nfsrv_writegather __P((struct nfsrv_descript **, struct nfssvc_sock *,
struct thread *, struct mbuf **));
int nfs_fsinfo __P((struct nfsmount *, struct vnode *, struct ucred *,
- struct thread *p));
+ struct thread *td));
int nfsrv3_access __P((struct nfsrv_descript *nfsd,
struct nfssvc_sock *slp,
diff --git a/sys/nfsclient/nfsstats.h b/sys/nfsclient/nfsstats.h
index d5d0796245d2..da808f4bf675 100644
--- a/sys/nfsclient/nfsstats.h
+++ b/sys/nfsclient/nfsstats.h
@@ -348,7 +348,7 @@ struct nfsreq {
int r_timer; /* tick counter on reply */
u_int32_t r_procnum; /* NFS procedure number */
int r_rtt; /* RTT for rpc */
- struct thread *r_td; /* Proc that did I/O system call */
+ struct thread *r_td; /* Proc that did I/O system call */
};
/*
@@ -598,7 +598,7 @@ int nfs_readrpc __P((struct vnode *, struct uio *, struct ucred *));
int nfs_writerpc __P((struct vnode *, struct uio *, struct ucred *, int *,
int *));
int nfs_commit __P((struct vnode *vp, u_quad_t offset, int cnt,
- struct ucred *cred, struct thread *));
+ struct ucred *cred, struct thread *td));
int nfs_readdirrpc __P((struct vnode *, struct uio *, struct ucred *));
int nfs_asyncio __P((struct buf *, struct ucred *, struct thread *));
int nfs_doio __P((struct buf *, struct ucred *, struct thread *));
@@ -658,7 +658,7 @@ void nfsrv_wakenfsd __P((struct nfssvc_sock *slp));
int nfsrv_writegather __P((struct nfsrv_descript **, struct nfssvc_sock *,
struct thread *, struct mbuf **));
int nfs_fsinfo __P((struct nfsmount *, struct vnode *, struct ucred *,
- struct thread *p));
+ struct thread *td));
int nfsrv3_access __P((struct nfsrv_descript *nfsd,
struct nfssvc_sock *slp,