From 7511ffb9d039a1d2d174e6915eff79b04690d6ac Mon Sep 17 00:00:00 2001
From: Karel Zak <kzak@redhat.com>
Date: Thu, 20 Apr 2023 12:36:41 +0200
Subject: [PATCH] libmount: don't include mount-api-utils.h everywhere

Let's keep the file included only when the new kernel API is
necessary.

Signed-off-by: Karel Zak <kzak@redhat.com>
---
 libmount/src/hook_idmap.c  | 6 +++++-
 libmount/src/hook_mount.c  | 2 ++
 libmount/src/hook_subdir.c | 1 +
 libmount/src/mountP.h      | 1 -
 libmount/src/optlist.c     | 1 +
 5 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/libmount/src/hook_idmap.c b/libmount/src/hook_idmap.c
index 97808f32bb..affd8fb144 100644
--- a/libmount/src/hook_idmap.c
+++ b/libmount/src/hook_idmap.c
@@ -18,12 +18,16 @@
 #include <stdbool.h>
 #include <sys/socket.h>
 #include <sys/wait.h>
+#include <sys/ioctl.h>
+#include <sys/mount.h>
 #include <inttypes.h>
 
-#include "mountP.h"
 #include "strutils.h"
 #include "all-io.h"
 #include "namespace.h"
+#include "mount-api-utils.h"
+
+#include "mountP.h"
 
 #ifdef HAVE_LINUX_NSFS_H
 # include <linux/nsfs.h>
diff --git a/libmount/src/hook_mount.c b/libmount/src/hook_mount.c
index 117150dec2..7fcf3f3f84 100644
--- a/libmount/src/hook_mount.c
+++ b/libmount/src/hook_mount.c
@@ -45,6 +45,8 @@
 
 #include "mountP.h"
 #include "fileutils.h"	/* statx() fallback */
+#include "mount-api-utils.h"
+
 #include <inttypes.h>
 
 #ifdef USE_LIBMOUNT_MOUNTFD_SUPPORT
diff --git a/libmount/src/hook_subdir.c b/libmount/src/hook_subdir.c
index 77b073a695..85b39465cd 100644
--- a/libmount/src/hook_subdir.c
+++ b/libmount/src/hook_subdir.c
@@ -19,6 +19,7 @@
 
 #include "mountP.h"
 #include "fileutils.h"
+#include "mount-api-utils.h"
 
 static int tmptgt_cleanup(int old_ns_fd);
 
diff --git a/libmount/src/mountP.h b/libmount/src/mountP.h
index bceb04a92b..d7ae6b7d2d 100644
--- a/libmount/src/mountP.h
+++ b/libmount/src/mountP.h
@@ -29,7 +29,6 @@
 #include "debug.h"
 #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 e6adc0c668..a8c1ad89a6 100644
--- a/libmount/src/optlist.c
+++ b/libmount/src/optlist.c
@@ -16,6 +16,7 @@
 #include "strutils.h"
 #include "list.h"
 #include "mountP.h"
+#include "mount-api-utils.h"
 
 #define MNT_OL_MAXMAPS	8
 
-- 
2.47.2