libmount: Allow MNT_FORCE and MNT_DETACH at umount

MNT_FORCE and MNT_DETACH are orthogonal in the Linux kernel, so both may
be specified without any problems. Even if there were a problem with
this combination, it should be up to the kernel to take the correct
action or report an error.

Signed-off-by: Joshua Watt <JPEWhacker@gmail.com>

diff --git a/libmount/src/context_umount.c b/libmount/src/context_umount.c
index f6b4ba737e03f50654adaa9a08873cba225a5ba7..45651b58e3b239e683a782a5aaa7520407088ee3 100644 (file)
--- a/libmount/src/context_umount.c
+++ b/libmount/src/context_umount.c
@@ -704,7 +704,7 @@ static int do_umount(struct libmnt_context *cxt)
        if (mnt_context_is_lazy(cxt))
                flags |= MNT_DETACH;
 
-       else if (mnt_context_is_force(cxt))
+       if (mnt_context_is_force(cxt))
                flags |= MNT_FORCE;
 
        DBG(CXT, ul_debugobj(cxt, "umount(2) [target='%s', flags=0x%08x]%s",