mount.nfs: Eliminate compiler warning in utils/mount/nfsumount.c

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

diff --git a/utils/mount/nfsumount.c b/utils/mount/nfsumount.c
index 9d798a2ff347513779b646b88692ae873844b158..b1927de92f156186b3099385ad383c3bfe2b2fad 100644 (file)
--- a/utils/mount/nfsumount.c
+++ b/utils/mount/nfsumount.c
@@ -31,6 +31,7 @@
 #include "nls.h"
 
 #include "mount_constants.h"
+#include "nfs_mount.h"
 #include "mount.h"
 #include "error.h"
 #include "network.h"
@@ -109,7 +110,7 @@ static int del_mtab(const char *spec, const char *node)
                        res = try_remount(spec, node);
                        if (res)
                                goto writemtab;
-                       return 0;
+                       return EX_SUCCESS;
                } else
                        umnt_err = errno;
        }
@@ -127,7 +128,7 @@ static int del_mtab(const char *spec, const char *node)
        }
 
        if (res >= 0)
-               return 0;
+               return EX_SUCCESS;
 
        if (umnt_err)
                umount_error(umnt_err, node);
@@ -179,10 +180,8 @@ static int nfs_umount_do_umnt(struct mount_options *options,
        struct pmap nfs_pmap, mnt_pmap;
        sa_family_t family;
 
-       if (!nfs_options2pmap(options, &nfs_pmap, &mnt_pmap)) {
-               nfs_error(_("%s: bad mount options"), progname);
+       if (!nfs_options2pmap(options, &nfs_pmap, &mnt_pmap))
                return EX_FAIL;
-       }
 
        /* Skip UMNT call for vers=4 mounts */
        if (nfs_pmap.pm_vers == 4)
@@ -364,7 +363,7 @@ int nfsumount(int argc, char *argv[])
                }
        }
 
-       ret = 0;
+       ret = EX_SUCCESS;
        if (mc) {
                if (!lazy && strcmp(mc->m.mnt_type, "nfs4") != 0)
                        /* We ignore the error from nfs_umount23.
@@ -373,7 +372,7 @@ int nfsumount(int argc, char *argv[])
                         * could cause /sbin/mount to retry!
                         */
                        nfs_umount23(mc->m.mnt_fsname, mc->m.mnt_opts);
-               ret = del_mtab(mc->m.mnt_fsname, mc->m.mnt_dir) ?: ret;
+               ret = del_mtab(mc->m.mnt_fsname, mc->m.mnt_dir);
        } else if (*spec != '/') {
                if (!lazy)
                        ret = nfs_umount23(spec, "tcp,v3");