summaryrefslogtreecommitdiffstats
path: root/sys/nfs
diff options
context:
space:
mode:
authorpeter <peter@FreeBSD.org>2001-09-15 04:41:56 +0000
committerpeter <peter@FreeBSD.org>2001-09-15 04:41:56 +0000
commit2392b3448b363d65802a81f4f8f3fc95dc58354a (patch)
treeb666113441f139b3cd7ec89faeefbc9b45f80305 /sys/nfs
parentfa365599496ad99272761caa64bab29d10294c35 (diff)
downloadFreeBSD-src-2392b3448b363d65802a81f4f8f3fc95dc58354a.zip
FreeBSD-src-2392b3448b363d65802a81f4f8f3fc95dc58354a.tar.gz
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.
Diffstat (limited to 'sys/nfs')
-rw-r--r--sys/nfs/nfs.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/nfs/nfs.h b/sys/nfs/nfs.h
index d5d0796..da808f4 100644
--- a/sys/nfs/nfs.h
+++ b/sys/nfs/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,
OpenPOWER on IntegriCloud