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 565825ca5dd490622e150ccc1b60fce14af242a2..3bc03ff87000f8960412159f622666f552ed08e0 100644 (file)
--- 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 0fa93355975020696350a612fa0cafa8fc2d1cfc..814b427732968f6f416a6ce5c9e0e1b3510f2140 100644 (file)
--- 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 7622cc86395a5c5a77f7bb06cd15d240704872c8..f87f06816cd7a35c2c8009d7e6523a4c2c898031 100644 (file)
--- 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 1ccf7b520c68f5b6c93f340fa77d7089170ea945..5949af7d8246c00c3120a10254cf43521398d4fd 100644 (file)
--- 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 6b9bd4bb25a011c1adeac0aced71935747dd2860..23eca4efdc4db2c017dc4bf87e6cb92a5f7aa538 100644 (file)
--- 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 893f9e72947a3a10d027df778ebe16b025f79fc7..9835415c4355c77831de5648db326233589ca30e 100644 (file)
--- 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 4ca3ef4b41047c96d619c9e9c3013884a0282b39..256c592fdec5e75f33cea95363355ef3b04c7e48 100644 (file)
--- 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 b1e34327e89f62598bb07c29b97bc3c4a9a364a0..f60c15c516557ef71a508e80bdeef552000224c6 100644 (file)
--- 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[] = {