summaryrefslogtreecommitdiff
path: root/sys/nfs
diff options
context:
space:
mode:
authorDamien Miller <djm@cvs.openbsd.org>2008-06-09 22:49:16 +0000
committerDamien Miller <djm@cvs.openbsd.org>2008-06-09 22:49:16 +0000
commit6dc5f484226bfbdd5bc21dd207edb89860061592 (patch)
tree6fc49eb28db955c2401cb6c6b15a51d66a6f2d32 /sys/nfs
parent4292580034d73b1c4cdfac0005dc9e4d2589bda1 (diff)
nfsm_get_xid() => nfs_get_xid() after thib@ informed me that the
nfsm_* functions are for mbufs
Diffstat (limited to 'sys/nfs')
-rw-r--r--sys/nfs/nfs_subs.c6
-rw-r--r--sys/nfs/nfs_var.h4
2 files changed, 5 insertions, 5 deletions
diff --git a/sys/nfs/nfs_subs.c b/sys/nfs/nfs_subs.c
index a0388edd5d5..ec707792590 100644
--- a/sys/nfs/nfs_subs.c
+++ b/sys/nfs/nfs_subs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: nfs_subs.c,v 1.75 2008/06/09 22:47:42 djm Exp $ */
+/* $OpenBSD: nfs_subs.c,v 1.76 2008/06/09 22:49:15 djm Exp $ */
/* $NetBSD: nfs_subs.c,v 1.27.4.3 1996/07/08 20:34:24 jtc Exp $ */
/*
@@ -551,7 +551,7 @@ nfsm_reqh(vp, procid, hsiz, bposp)
* Return an unpredictable XID.
*/
u_int32_t
-nfsm_get_xid(void)
+nfs_get_xid(void)
{
static struct idgen32_ctx nfs_xid_ctx;
static int called = 0;
@@ -618,7 +618,7 @@ nfsm_rpchead(struct nfsreq *req, struct ucred *cr, int auth_type,
tl = nfsm_build(&mb, 6 * NFSX_UNSIGNED, &bpos);
/* Get a new (non-zero) xid */
- nfs_xid = nfsm_get_xid();
+ nfs_xid = nfs_get_xid();
*tl++ = req->r_xid = txdr_unsigned(nfs_xid);
*tl++ = rpc_call;
diff --git a/sys/nfs/nfs_var.h b/sys/nfs/nfs_var.h
index 19e29c0afa2..ff9c405c8ac 100644
--- a/sys/nfs/nfs_var.h
+++ b/sys/nfs/nfs_var.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: nfs_var.h,v 1.36 2008/06/09 22:47:42 djm Exp $ */
+/* $OpenBSD: nfs_var.h,v 1.37 2008/06/09 22:49:15 djm Exp $ */
/* $NetBSD: nfs_var.h,v 1.3 1996/02/18 11:53:54 fvdl Exp $ */
/*
@@ -238,7 +238,7 @@ void nfsrv_cleancache(void);
/* nfs_subs.c */
struct mbuf *nfsm_reqh(struct vnode *, u_long, int, caddr_t *);
-u_int32_t nfsm_get_xid(void);
+u_int32_t nfs_get_xid(void);
void nfsm_rpchead(struct nfsreq *, struct ucred *, int, struct mbuf *, int);
void *nfsm_build(struct mbuf **, u_int, caddr_t *);
int nfsm_mbuftouio(struct mbuf **, struct uio *, int, caddr_t *);