From: Joshua Watt Date: Mon, 6 Nov 2017 22:25:36 +0000 (-0600) Subject: libmount: Allow MNT_FORCE and MNT_DETACH at umount X-Git-Tag: v2.32-rc1~219 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5d9c79666087d81363b9b942f213d7840d2f695b;p=thirdparty%2Futil-linux.git 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 --- diff --git a/libmount/src/context_umount.c b/libmount/src/context_umount.c index f6b4ba737e..45651b58e3 100644 --- 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",