X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;ds=sidebyside;f=utils%2Fmount%2Fnfsumount.c;h=9e9cd16a66e8c5d959e07dc8a129716d97adbe9a;hb=df0a06a985a15f088d0a7fb39c61a98e6aac9830;hp=e7f37efe90639a231cde438e3ff304c9bf9990ae;hpb=e227ac0348431eecc1ddadf5d1907c8348741519;p=nfs-utils.git

diff --git a/utils/mount/nfsumount.c b/utils/mount/nfsumount.c
index e7f37ef..9e9cd16 100644
--- a/utils/mount/nfsumount.c
+++ b/utils/mount/nfsumount.c
@@ -348,10 +348,9 @@ 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);
+		ret = del_mtab(mc->m.mnt_fsname, mc->m.mnt_dir) ?: ret;
 	} else if (*spec != '/') {
 		if (!lazy)
 			ret = do_nfs_umount(spec, "tcp,v3");