summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChuck Lever <chuck.lever@oracle.com>2007-07-28 17:50:09 -0400
committerNeil Brown <neilb@suse.de>2007-07-30 16:12:53 +1000
commitf677d6b430927f5141c89874c649a7650a831550 (patch)
tree9e6e0e8320b756fef10889cdc45435ee8756986e
parentf5bab6c03c5205ef9d062f167cc30060f90fedc4 (diff)
downloadnfs-utils-f677d6b430927f5141c89874c649a7650a831550.tar.gz
nfs-utils-f677d6b430927f5141c89874c649a7650a831550.tar.xz
nfs-utils-f677d6b430927f5141c89874c649a7650a831550.zip
umount.nfs: Pass return codes from do_nfs_umount back
Do we really care about these return codes? Signed-off-by: Chuck Lever <chuck.lever@oracle.com> Signed-off-by: Neil Brown <neilb@suse.de>
-rw-r--r--utils/mount/nfsumount.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/utils/mount/nfsumount.c b/utils/mount/nfsumount.c
index fd4194f..a15e524 100644
--- a/utils/mount/nfsumount.c
+++ b/utils/mount/nfsumount.c
@@ -326,11 +326,12 @@ int nfsumount(int argc, char *argv[])
ret = 0;
if (mc) {
if (!lazy)
- do_nfs_umount(mc->m.mnt_fsname, mc->m.mnt_opts);
- ret = del_mtab(mc->m.mnt_fsname, mc->m.mnt_dir);
+ 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);
} else if (*spec != '/') {
if (!lazy)
- do_nfs_umount(spec, "tcp,v3");
+ ret = do_nfs_umount(spec, "tcp,v3");
} else
ret = del_mtab(NULL, spec);