Fix version fallback for unmount.

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

diff --git a/utils/mount/nfsumount.c b/utils/mount/nfsumount.c
index 4311473b5536f892ad65492b601479c77f394831..285273b9ee56c1e3601ba482bfbc8708d3ba3f74 100644 (file)
--- a/utils/mount/nfsumount.c
+++ b/utils/mount/nfsumount.c
@@ -102,10 +102,14 @@ static int del_mtab(const char *spec, const char *node)
        } else
                res = umount (node);
 
-       if (res < 0 && remount && errno == EBUSY && spec) {
-               res = try_remount(spec, node);
-               if (!res)
+       if (res < 0) {
+               if (remount && errno == EBUSY && spec) {
+                       res = try_remount(spec, node);
+                       if (res)
+                               goto writemtab;
                        return 0;
+               } else
+                       umnt_err = errno;
        }
 
        if (res >= 0) {
@@ -138,7 +142,7 @@ static int del_mtab(const char *spec, const char *node)
  * We will need this information to get through the firewall again
  * to do the umount.
  */
-static int do_nfs_umount(const char *spec, char *opts)
+static int do_nfs_umount23(const char *spec, char *opts)
 {
        char *hostname;
        char *dirname;
@@ -186,7 +190,7 @@ static int do_nfs_umount(const char *spec, char *opts)
        }
 
        pmap->pm_prog = MOUNTPROG;
-       pmap->pm_vers = MOUNTVERS_NFSV3;
+       pmap->pm_vers = 0; /* unknown */
        if (opts && (p = strstr(opts, "mountprog=")) && isdigit(*(p+10)))
                pmap->pm_prog = atoi(p+10);
        if (opts && (p = strstr(opts, "mountport=")) && isdigit(*(p+10)))
@@ -195,8 +199,6 @@ static int do_nfs_umount(const char *spec, char *opts)
                pmap->pm_vers = nfsvers_to_mnt(2);
        if (opts && hasmntopt(&mnt, "v3"))
                pmap->pm_vers = nfsvers_to_mnt(3);
-       if (opts && hasmntopt(&mnt, "v4"))
-               pmap->pm_vers = nfsvers_to_mnt(4);
        if (opts && (p = strstr(opts, "vers=")) && isdigit(*(p+5)))
                pmap->pm_vers = nfsvers_to_mnt(atoi(p+5));
        if (opts && (p = strstr(opts, "mountvers=")) && isdigit(*(p+10)))
@@ -344,13 +346,12 @@ int nfsumount(int argc, char *argv[])
 
        ret = 0;
        if (mc) {
-               if (!lazy)
-                       ret = do_nfs_umount(mc->m.mnt_fsname, mc->m.mnt_opts);
-               if (!ret || force)
-                       ret = del_mtab(mc->m.mnt_fsname, mc->m.mnt_dir);
+               if (!lazy && strcmp(mc->m.mnt_type, "nfs4") != 0)
+                       ret = do_nfs_umount23(mc->m.mnt_fsname, mc->m.mnt_opts);
+               ret = del_mtab(mc->m.mnt_fsname, mc->m.mnt_dir) ?: ret;
        } else if (*spec != '/') {
                if (!lazy)
-                       ret = do_nfs_umount(spec, "tcp,v3");
+                       ret = do_nfs_umount23(spec, "tcp,v3");
        } else
                ret = del_mtab(NULL, spec);