summaryrefslogtreecommitdiffstats
path: root/sbin/umount
diff options
context:
space:
mode:
authordfr <dfr@FreeBSD.org>2009-06-24 18:42:21 +0000
committerdfr <dfr@FreeBSD.org>2009-06-24 18:42:21 +0000
commitec9ddec04ca1bcd7e7bb514dfc6970627ee47872 (patch)
treebbae5223b9078101f704aa848f53e3f5f9e20cd7 /sbin/umount
parent6c60345b340131c66e68bbef66500d1f0eefb556 (diff)
downloadFreeBSD-src-ec9ddec04ca1bcd7e7bb514dfc6970627ee47872.zip
FreeBSD-src-ec9ddec04ca1bcd7e7bb514dfc6970627ee47872.tar.gz
Don't use sys/nfs/rpcv2.h - it is part of the old kernel RPC implementation
and will be removed.
Diffstat (limited to 'sbin/umount')
-rw-r--r--sbin/umount/umount.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/sbin/umount/umount.c b/sbin/umount/umount.c
index c00a09d..cbacb4b 100644
--- a/sbin/umount/umount.c
+++ b/sbin/umount/umount.c
@@ -48,7 +48,7 @@ static const char rcsid[] =
#include <netdb.h>
#include <rpc/rpc.h>
-#include <nfs/rpcv2.h>
+#include <rpcsvc/mount.h>
#include <ctype.h>
#include <err.h>
@@ -379,16 +379,16 @@ umountfs(struct statfs *sfs)
* has been unmounted.
*/
if (ai != NULL && !(fflag & MNT_FORCE) && do_rpc) {
- clp = clnt_create(hostp, RPCPROG_MNT, RPCMNT_VER1, "udp");
+ clp = clnt_create(hostp, MOUNTPROG, MOUNTVERS, "udp");
if (clp == NULL) {
warnx("%s: %s", hostp,
- clnt_spcreateerror("RPCPROG_MNT"));
+ clnt_spcreateerror("MOUNTPROG"));
return (1);
}
clp->cl_auth = authsys_create_default();
try.tv_sec = 20;
try.tv_usec = 0;
- clnt_stat = clnt_call(clp, RPCMNT_UMOUNT, (xdrproc_t)xdr_dir,
+ clnt_stat = clnt_call(clp, MOUNTPROC_UMNT, (xdrproc_t)xdr_dir,
nfsdirname, (xdrproc_t)xdr_void, (caddr_t)0, try);
if (clnt_stat != RPC_SUCCESS) {
warnx("%s: %s", hostp,
@@ -583,7 +583,7 @@ int
xdr_dir(XDR *xdrsp, char *dirp)
{
- return (xdr_string(xdrsp, &dirp, RPCMNT_PATHLEN));
+ return (xdr_string(xdrsp, &dirp, MNTPATHLEN));
}
void
OpenPOWER on IntegriCloud