mount.nfs: Error handling clean-up

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

diff --git a/utils/mount/nfsumount.c b/utils/mount/nfsumount.c
index 81fd2640cb4e7cb695062fad5ac425f4513ea694..1b3c8d105daba1e05bca2c592b4825f9930a72d1 100644 (file)
--- a/utils/mount/nfsumount.c
+++ b/utils/mount/nfsumount.c
@@ -35,6 +35,7 @@
 #include "mount.h"
 #include "nfsumount.h"
 #include "error.h"
+#include "network.h"
 
 #if !defined(MNT_FORCE)
 /* dare not try to include <linux/mount.h> -- lots of errors */
@@ -46,17 +47,12 @@
 #endif
 
 extern char *progname;
-extern int nfs_mount_version;
 extern int nomtab;
 extern int verbose;
 int force;
 int lazy;
 int remount;
 
-extern int find_kernel_nfs_mount_version(void);
-extern int probe_mntport(clnt_addr_t *);
-extern int nfs_gethostbyname(const char *, struct sockaddr_in *);
-
 static inline enum clnt_stat
 nfs_umount(dirpath *argp, CLIENT *clnt)
 {
@@ -161,7 +157,7 @@ int del_mtab(const char *spec, const char *node)
 
         if (umnt_err)
                 umount_error(umnt_err, node);
-        return 1;
+        return EX_FILEIO;
 }
 
 /*
@@ -176,7 +172,6 @@ int _nfsumount(const char *spec, char *opts)
        struct pmap *pmap = &mnt_server.pmap;
        char *p;
 
-       nfs_mount_version = find_kernel_nfs_mount_version();
        if (spec == NULL || (p = strchr(spec,':')) == NULL)
                goto out_bad;
        hostname = xstrndup(spec, p-spec);
@@ -312,7 +307,7 @@ int nfsumount(int argc, char *argv[])
            strcmp(mc->m.mnt_type, "nfs4") != 0) {
                fprintf(stderr, "umount.nfs: %s on %s it not an nfs filesystem\n",
                        mc->m.mnt_fsname, mc->m.mnt_dir);
-               exit(1);
+               return EX_USAGE;
        }
 
        if (getuid() != 0) {
@@ -360,6 +355,6 @@ int nfsumount(int argc, char *argv[])
        } else
                ret = del_mtab(NULL, spec);
 
-       return(ret);
+       return ret;
 }