From: Karel Zak <kzak@redhat.com>
Date: Mon, 22 Jul 2024 12:12:37 +0000 (+0200)
Subject: libmount: add mount-api-utils.h to mountP.h
X-Git-Tag: v2.42-start~97^2~36
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c2c50a4b60d6d723aae1b3e0e80b0b9483fafe60;p=thirdparty%2Futil-linux.git

libmount: add mount-api-utils.h to mountP.h

The new syscalls (statmount and fd-based mount) are already being
utilized in various areas within the library. Therefore, it would be
more efficient to include the syscalls header file in the private main
library header file.

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

diff --git a/libmount/src/context.c b/libmount/src/context.c
index 565825ca5..3bc03ff87 100644
--- a/libmount/src/context.c
+++ b/libmount/src/context.c
@@ -44,8 +44,6 @@
 #include <stdarg.h>
 #include <sys/wait.h>
 
-#include "mount-api-utils.h"
-
 /**
  * mnt_new_context:
  *
diff --git a/libmount/src/hook_idmap.c b/libmount/src/hook_idmap.c
index 0fa933559..814b42773 100644
--- a/libmount/src/hook_idmap.c
+++ b/libmount/src/hook_idmap.c
@@ -25,7 +25,6 @@
 #include "strutils.h"
 #include "all-io.h"
 #include "namespace.h"
-#include "mount-api-utils.h"
 
 #include "mountP.h"
 
diff --git a/libmount/src/hook_mount.c b/libmount/src/hook_mount.c
index 7622cc863..f87f06816 100644
--- a/libmount/src/hook_mount.c
+++ b/libmount/src/hook_mount.c
@@ -46,7 +46,6 @@
 #include "mountP.h"
 #include "fileutils.h"	/* statx() fallback */
 #include "strutils.h"
-#include "mount-api-utils.h"
 #include "linux_version.h"
 
 #include <inttypes.h>
diff --git a/libmount/src/hook_subdir.c b/libmount/src/hook_subdir.c
index 1ccf7b520..5949af7d8 100644
--- a/libmount/src/hook_subdir.c
+++ b/libmount/src/hook_subdir.c
@@ -19,7 +19,6 @@
 
 #include "mountP.h"
 #include "fileutils.h"
-#include "mount-api-utils.h"
 
 struct hookset_data {
 	char *subdir;
diff --git a/libmount/src/hooks.c b/libmount/src/hooks.c
index 6b9bd4bb2..23eca4efd 100644
--- a/libmount/src/hooks.c
+++ b/libmount/src/hooks.c
@@ -27,7 +27,6 @@
  *   Usually implemented by locally defined 'struct hook_data' in hook_*.c.
  */
 #include "mountP.h"
-#include "mount-api-utils.h"
 
 /* built-in hooksets */
 static const struct libmnt_hookset *const hooksets[] =
diff --git a/libmount/src/mountP.h b/libmount/src/mountP.h
index 893f9e729..9835415c4 100644
--- a/libmount/src/mountP.h
+++ b/libmount/src/mountP.h
@@ -30,6 +30,8 @@
 #include "buffer.h"
 #include "libmount.h"
 
+#include "mount-api-utils.h"
+
 /*
  * Debug
  */
diff --git a/libmount/src/optlist.c b/libmount/src/optlist.c
index 4ca3ef4b4..256c592fd 100644
--- a/libmount/src/optlist.c
+++ b/libmount/src/optlist.c
@@ -16,7 +16,6 @@
 #include "strutils.h"
 #include "list.h"
 #include "mountP.h"
-#include "mount-api-utils.h"
 
 #define MNT_OL_MAXMAPS	8
 
diff --git a/libmount/src/version.c b/libmount/src/version.c
index b1e34327e..f60c15c51 100644
--- a/libmount/src/version.c
+++ b/libmount/src/version.c
@@ -19,7 +19,6 @@
 #include <ctype.h>
 
 #include "mountP.h"
-#include "mount-api-utils.h"
 
 static const char *lib_version = LIBMOUNT_VERSION;
 static const char *lib_features[] = {