umount.nfs: move nfs_call_umount to network.c

[nfs-utils.git] / utils / mount / nfsumount.c

diff --git a/utils/mount/nfsumount.c b/utils/mount/nfsumount.c
index a0fe78ea1cd52456bd6cbdce784fa5846a87ac80..9b7c44d167688d072347643edf15d36db06c7e88 100644 (file)
--- a/utils/mount/nfsumount.c
+++ b/utils/mount/nfsumount.c
@@ -53,43 +53,6 @@ int force;
 int lazy;
 int remount;
 
-static inline enum clnt_stat
-nfs_umount(dirpath *argp, CLIENT *clnt)
-{
-       return clnt_call(clnt, MOUNTPROC_UMNT,
-                        (xdrproc_t) xdr_dirpath, (caddr_t)argp,
-                        (xdrproc_t) xdr_void, NULL,
-                        TIMEOUT);
-}
-
-int nfs_call_umount(clnt_addr_t *mnt_server, dirpath *argp)
-{
-       CLIENT *clnt;
-       enum clnt_stat res = 0;
-       int msock;
-
-       switch (mnt_server->pmap.pm_vers) {
-       case 3:
-       case 2:
-       case 1:
-               if (!probe_mntport(mnt_server))
-                       goto out_bad;
-               clnt = mnt_openclnt(mnt_server, &msock);
-               if (!clnt)
-                       goto out_bad;
-               res = nfs_umount(argp, clnt);
-               mnt_closeclnt(clnt, msock);
-               if (res == RPC_SUCCESS)
-                       return 1;
-               break;
-       default:
-               res = 1;
-               break;
-       }
- out_bad:
-       return res;
-}
-
 int del_mtab(const char *spec, const char *node)
 {
        int umnt_err, res;
@@ -235,7 +198,7 @@ static struct option umount_longopts[] =
   { NULL, 0, 0, 0 }
 };
 
-void umount_usage(void)
+static void umount_usage(void)
 {
        printf("usage: %s dir [-fvnrlh]\n", progname);
        printf("options:\n\t-f\t\tforce unmount\n");
@@ -252,6 +215,11 @@ int nfsumount(int argc, char *argv[])
        char *spec;
        struct mntentchn *mc;
 
+       if (argc < 2) {
+               umount_usage();
+               return EX_USAGE;
+       }
+
        spec = argv[1];
 
        argv += 1;