From b121ac4404c60aefdaa2c78d8c8b72b4add9f2d5 Mon Sep 17 00:00:00 2001
From: David Sterba <dsterba@suse.com>
Date: Wed, 14 Sep 2022 21:41:58 +0200
Subject: [PATCH] btrfs-progs: fix path to internal libbtrfsutil includes

All files include the <btrfsutil.h> which could be confused with the
system-wide installation. Drop the -I path from build and use full path
for any libbtrfsutil headers.

Signed-off-by: David Sterba <dsterba@suse.com>
---
 Makefile          | 1 -
 cmds/filesystem.c | 2 +-
 cmds/property.c   | 2 +-
 cmds/qgroup.c     | 2 +-
 cmds/receive.c    | 2 +-
 cmds/subvolume.c  | 2 +-
 common/utils.c    | 2 +-
 7 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index 5a8dd742..2c436d8d 100644
--- a/Makefile
+++ b/Makefile
@@ -95,7 +95,6 @@ CFLAGS = $(SUBST_CFLAGS) \
 	 -fno-strict-aliasing \
 	 -fPIC \
 	 -I$(TOPDIR) \
-	 -I$(TOPDIR)/libbtrfsutil \
 	 $(CRYPTO_CFLAGS) \
 	 -DCOMPRESSION_LZO=$(COMPRESSION_LZO) \
 	 -DCOMPRESSION_ZSTD=$(COMPRESSION_ZSTD) \
diff --git a/cmds/filesystem.c b/cmds/filesystem.c
index c01026d5..65ae26ee 100644
--- a/cmds/filesystem.c
+++ b/cmds/filesystem.c
@@ -29,7 +29,7 @@
 #include <getopt.h>
 #include <limits.h>
 #include <uuid/uuid.h>
-#include <btrfsutil.h>
+#include "libbtrfsutil/btrfsutil.h"
 #include "kernel-shared/ctree.h"
 #include "kernel-shared/volumes.h"
 #include "kernel-lib/list_sort.h"
diff --git a/cmds/property.c b/cmds/property.c
index 9f734879..8bd88cdf 100644
--- a/cmds/property.c
+++ b/cmds/property.c
@@ -23,7 +23,7 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include <uuid/uuid.h>
-#include <btrfsutil.h>
+#include "libbtrfsutil/btrfsutil.h"
 #include "kernel-shared/ctree.h"
 #include "common/open-utils.h"
 #include "common/utils.h"
diff --git a/cmds/qgroup.c b/cmds/qgroup.c
index b48643aa..d197b026 100644
--- a/cmds/qgroup.c
+++ b/cmds/qgroup.c
@@ -20,7 +20,7 @@
 #include <unistd.h>
 #include <getopt.h>
 #include <errno.h>
-#include <btrfsutil.h>
+#include "libbtrfsutil/btrfsutil.h"
 #include "kernel-shared/ctree.h"
 #include "common/open-utils.h"
 #include "common/utils.h"
diff --git a/cmds/receive.c b/cmds/receive.c
index c430e6c4..ff6839f8 100644
--- a/cmds/receive.c
+++ b/cmds/receive.c
@@ -46,6 +46,7 @@
 #if COMPRESSION_ZSTD
 #include <zstd.h>
 #endif
+#include "libbtrfsutil/stubs.h"
 #include "kernel-shared/ctree.h"
 #include "kernel-lib/list.h"
 #include "kernel-shared/send.h"
@@ -56,7 +57,6 @@
 #include "common/path-utils.h"
 #include "cmds/commands.h"
 #include "cmds/receive-dump.h"
-#include "stubs.h"
 #include "ioctl.h"
 
 struct btrfs_receive
diff --git a/cmds/subvolume.c b/cmds/subvolume.c
index 4f46df41..e63ae081 100644
--- a/cmds/subvolume.c
+++ b/cmds/subvolume.c
@@ -28,7 +28,7 @@
 #include <limits.h>
 #include <getopt.h>
 #include <uuid/uuid.h>
-#include <btrfsutil.h>
+#include "libbtrfsutil/btrfsutil.h"
 #include "cmds/qgroup.h"
 #include "kernel-shared/ctree.h"
 #include "common/utils.h"
diff --git a/common/utils.c b/common/utils.c
index e9965569..00732a21 100644
--- a/common/utils.c
+++ b/common/utils.c
@@ -37,7 +37,7 @@
 #include <getopt.h>
 #include <blkid/blkid.h>
 #include <uuid/uuid.h>
-#include <btrfsutil.h>
+#include "libbtrfsutil/btrfsutil.h"
 #include "kernel-lib/radix-tree.h"
 #include "kernel-shared/ctree.h"
 #include "kernel-shared/disk-io.h"