mount.nfs: Support "-t nfs,vers=4" mounts in the kernel

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

diff --git a/utils/mount/nfsumount.c b/utils/mount/nfsumount.c
index ba2790068dcc79de499939b08d1d86e9972b3639..c5505b1edf6d436532f93310f0d2a433e70c19a2 100644 (file)
--- a/utils/mount/nfsumount.c
+++ b/utils/mount/nfsumount.c
@@ -179,6 +179,10 @@ static int nfs_umount_do_umnt(struct mount_options *options,
                return EX_FAIL;
        }
 
+       /* Skip UMNT call for vers=4 mounts */
+       if (nfs_pmap.pm_vers == 4)
+               return EX_SUCCESS;
+
        *hostname = nfs_umount_hostname(options, *hostname);
        if (!*hostname) {
                nfs_error(_("%s: out of memory"), progname);
@@ -336,7 +340,7 @@ int nfsumount(int argc, char *argv[])
                        char *opt = hasmntopt(&mc->m, "user");
                        struct passwd *pw;
                        char *comma;
-                       int len;
+                       size_t len;
                        if (!opt)
                                goto only_root;
                        if (opt[4] != '=')