summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
4d5e8d3)
If we fail to talk to the NFS server when unmounted a v2 or v3 mount,
still do the unmount, but allow the error to propagate up.
Signed-off-by: Neil Brown <neilb@suse.de>
if (mc) {
if (!lazy && strcmp(mc->m.mnt_type, "nfs4") != 0)
ret = do_nfs_umount(mc->m.mnt_fsname, mc->m.mnt_opts);
if (mc) {
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");
} else if (*spec != '/') {
if (!lazy)
ret = do_nfs_umount(spec, "tcp,v3");