From 00610f5853f013aba1738d3fd8c8091574ff2f20 Mon Sep 17 00:00:00 2001
From: David Sterba <dsterba@suse.com>
Date: Wed, 29 Sep 2021 16:07:35 +0200
Subject: [PATCH] btrfs-progs: libbtrfs: remove unneeded BTRFS_FLAT_INCLUDES
 protections

Remove the switch for local and system-wide headers in headers that are
not part of libbtrfs anymore.

Signed-off-by: David Sterba <dsterba@suse.com>
---
 btrfs-list.h            | 7 -------
 check/btrfsck.h         | 7 -------
 common/utils-lib.c      | 5 -----
 crypto/crc32c.h         | 4 ----
 kernel-lib/radix-tree.h | 4 ----
 5 files changed, 27 deletions(-)

diff --git a/btrfs-list.h b/btrfs-list.h
index ea06e663..57bb04dd 100644
--- a/btrfs-list.h
+++ b/btrfs-list.h
@@ -19,16 +19,9 @@
 #ifndef __BTRFS_LIST_H__
 #define __BTRFS_LIST_H__
 
-#if BTRFS_FLAT_INCLUDES
 #include "kerncompat.h"
 #include "kernel-lib/rbtree.h"
 #include "ioctl.h"
-#else
-#include <btrfs/kerncompat.h>
-#include <btrfs/rbtree.h>
-#include <btrfs/ioctl.h>
-#endif /* BTRFS_FLAT_INCLUDES */
-
 #include <time.h>
 
 enum btrfs_list_layout {
diff --git a/check/btrfsck.h b/check/btrfsck.h
index 9f13d2c4..112c5406 100644
--- a/check/btrfsck.h
+++ b/check/btrfsck.h
@@ -20,17 +20,10 @@
 #ifndef __BTRFS_CHECK_H__
 #define __BTRFS_CHECK_H__
 
-#if BTRFS_FLAT_INCLUDES
 #include "kerncompat.h"
 #include "kernel-shared/ctree.h"
 #include "common/extent-cache.h"
 #include "kernel-lib/list.h"
-#else
-#include <btrfs/kerncompat.h>
-#include <btrfs/ctree.h>
-#include <btrfs/extent-cache.h>
-#include <btrfs/list.h>
-#endif /* BTRFS_FLAT_INCLUDES */
 
 struct block_group_record {
 	struct cache_extent cache;
diff --git a/common/utils-lib.c b/common/utils-lib.c
index 461760e1..3d061c25 100644
--- a/common/utils-lib.c
+++ b/common/utils-lib.c
@@ -21,12 +21,7 @@
 #include <limits.h>
 #include <sys/ioctl.h>
 #include <ioctl.h>
-
-#if BTRFS_FLAT_INCLUDES
 #include "kernel-shared/ctree.h"
-#else
-#include <btrfs/ctree.h>
-#endif /* BTRFS_FLAT_INCLUDES */
 
 /*
  * This function should be only used when parsing command arg, it won't return
diff --git a/crypto/crc32c.h b/crypto/crc32c.h
index 3f895181..be71a386 100644
--- a/crypto/crc32c.h
+++ b/crypto/crc32c.h
@@ -19,11 +19,7 @@
 #ifndef __CRC32C__
 #define __CRC32C__
 
-#if BTRFS_FLAT_INCLUDES
 #include "kerncompat.h"
-#else
-#include <btrfs/kerncompat.h>
-#endif /* BTRFS_FLAT_INCLUDES */
 
 u32 crc32c_le(u32 seed, unsigned char const *data, size_t length);
 void crc32c_optimization_init(void);
diff --git a/kernel-lib/radix-tree.h b/kernel-lib/radix-tree.h
index bf96d839..d99ea7eb 100644
--- a/kernel-lib/radix-tree.h
+++ b/kernel-lib/radix-tree.h
@@ -37,11 +37,7 @@
 #ifndef _LINUX_RADIX_TREE_H
 #define _LINUX_RADIX_TREE_H
 
-#if BTRFS_FLAT_INCLUDES
 #include "kerncompat.h"
-#else
-#include <btrfs/kerncompat.h>
-#endif /* BTRFS_FLAT_INCLUDES */
 
 #define RADIX_TREE_MAX_TAGS 2