[PATCH] libmount: Allow MNT_FORCE and MNT_DETACH at umount

[PATCH] libmount: Allow MNT_FORCE and MNT_DETACH at umount

[Joshua Watt]

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>
---
 libmount/src/context_umount.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libmount/src/context_umount.c b/libmount/src/context_umount.c
index f6b4ba737..45651b58e 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",
-- 
2.13.6

Re: [PATCH] libmount: Allow MNT_FORCE and MNT_DETACH at umount

[Karel Zak]

On Mon, Nov 06, 2017 at 04:25:36PM -0600, Joshua Watt wrote:
> 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>
> ---
>  libmount/src/context_umount.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Applied, thanks.

-- 
 Karel Zak  <kzak@redhat.com>
 http://karelzak.blogspot.com