From: Neil Brown <neilb@suse.de>
Date: Tue, 20 Mar 2007 05:16:04 +0000 (+1100)
Subject: umount should succeed even if we cannot contact the server.
X-Git-Tag: nfs-utils-1-1-0-rc1~23
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=742190194badb6f08a4934c254d642cbf014c84e;p=nfs-utils.git

umount should succeed even if we cannot contact the server.

Failure to tell mountd about the unmount should not be classes
and an error and DEFINTELY should not stop the filesystem
from being unmounted.
---

diff --git a/utils/mount/nfsumount.c b/utils/mount/nfsumount.c
index e65f58f..b9737be 100644
--- a/utils/mount/nfsumount.c
+++ b/utils/mount/nfsumount.c
@@ -375,12 +375,11 @@ int nfsumount(int argc, char *argv[])
 	ret = 0;
 	if (mc) {
 		if (!lazy)
-			ret = _nfsumount(mc->m.mnt_fsname, mc->m.mnt_opts);
-		if(ret)
-			ret = del_mtab(mc->m.mnt_fsname, mc->m.mnt_dir);
+			_nfsumount(mc->m.mnt_fsname, mc->m.mnt_opts);
+		ret = del_mtab(mc->m.mnt_fsname, mc->m.mnt_dir);
 	} else if (*spec != '/') {
 		if (!lazy)
-			ret = _nfsumount(spec, "tcp,v3");
+			_nfsumount(spec, "tcp,v3");
 	} else
 		ret = del_mtab(NULL, spec);