summaryrefslogtreecommitdiffstats
path: root/libmount/src/context_umount.c
diff options
context:
space:
mode:
authorJoshua Watt2017-11-06 23:25:36 +0100
committerKarel Zak2017-11-08 12:31:43 +0100
commit5d9c79666087d81363b9b942f213d7840d2f695b (patch)
tree3b52fd0d019d3374a1ecf8ffcf081c65f6f5beb9 /libmount/src/context_umount.c
parentmd5: declare byteReverse as static (diff)
downloadkernel-qcow2-util-linux-5d9c79666087d81363b9b942f213d7840d2f695b.tar.gz
kernel-qcow2-util-linux-5d9c79666087d81363b9b942f213d7840d2f695b.tar.xz
kernel-qcow2-util-linux-5d9c79666087d81363b9b942f213d7840d2f695b.zip
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>
Diffstat (limited to 'libmount/src/context_umount.c')
-rw-r--r--libmount/src/context_umount.c2
1 files changed, 1 insertions, 1 deletions
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",