From: Chuck Lever <chuck.lever@oracle.com>
Date: Mon, 24 Sep 2007 15:29:36 +0000 (-0400)
Subject: Don't do_nfs_umount() for NFSv4 unmounts
X-Git-Tag: nfs-utils-1-1-1~41
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=97fed3061fd5c742ebd1f685e3e6dcb62e835b74;p=nfs-utils.git

Don't do_nfs_umount() for NFSv4 unmounts

No need to talk to mountd when unmounting nfs4 filesystems.

Signed-off-by: Kevin Coffman <kwc@citi.umich.edu>
Acked-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Neil Brown <neilb@suse.de>
---

diff --git a/utils/mount/nfsumount.c b/utils/mount/nfsumount.c
index e7f37ef..8902f00 100644
--- a/utils/mount/nfsumount.c
+++ b/utils/mount/nfsumount.c
@@ -348,7 +348,7 @@ int nfsumount(int argc, char *argv[])
 
 	ret = 0;
 	if (mc) {
-		if (!lazy)
+		if (!lazy && strcmp(mc->m.mnt_type, "nfs4") != 0)
 			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);