From: Karel Zak <kzak@redhat.com>
Date: Fri, 19 Aug 2022 16:44:00 +0000 (+0200)
Subject: libmount: (mkdir) simplify X-mount.mkdir check
X-Git-Tag: v2.39-rc1~300
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4e342001504ee59a034c3e6f4b5f1066398b82dd;p=thirdparty%2Futil-linux.git

libmount: (mkdir) simplify X-mount.mkdir check

It's enough to check for the option, it's unnecessary to check also flags.

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/libmount/src/hook_mkdir.c b/libmount/src/hook_mkdir.c
index b83907f42b..bd8a083030 100644
--- a/libmount/src/hook_mkdir.c
+++ b/libmount/src/hook_mkdir.c
@@ -94,7 +94,6 @@ static int hook_prepare_target(
 	int rc = 0;
 	mode_t mode = 0;
 	const char *tgt;
-	unsigned long flags = 0;
 
 	assert(cxt);
 
@@ -102,12 +101,7 @@ static int hook_prepare_target(
 	if (!tgt)
 		return 0;
 
-	rc = mnt_context_get_user_mflags(cxt, &flags);
-	if (rc)
-		return rc;
-
 	if (cxt->action == MNT_ACT_MOUNT
-	    && (flags & MNT_MS_XCOMMENT || flags & MNT_MS_XFSTABCOMM)
 	    && is_mkdir_required(cxt, tgt, &mode, &rc)) {
 
 		struct libmnt_cache *cache;