libxfs: move header includes closer to kernelspace

Aid application of future kernel patches which change #includes;
not all headers exist in userspace so this is not a 1:1 match, but
it brings userspace files a bit closer to kernelspace by adding all
#includes which do match, and putting them in the same order.

Signed-off-by: Eric Sandeen <sandeen@redhat.com>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>

diff --git a/libxfs/xfs_ag_resv.c b/libxfs/xfs_ag_resv.c
index 1fe13bf44f03b21236c2a035dac04dd255126002..530455a51772d44aac171146138a7100d071f36f 100644 (file)
--- a/libxfs/xfs_ag_resv.c
+++ b/libxfs/xfs_ag_resv.c
@@ -7,10 +7,13 @@
 #include "xfs_fs.h"
 #include "xfs_shared.h"
 #include "xfs_format.h"
+#include "xfs_log_format.h"
 #include "xfs_trans_resv.h"
 #include "xfs_mount.h"
 #include "xfs_alloc.h"
+#include "xfs_errortag.h"
 #include "xfs_trace.h"
+#include "xfs_trans.h"
 #include "xfs_rmap_btree.h"
 #include "xfs_btree.h"
 #include "xfs_refcount_btree.h"

diff --git a/libxfs/xfs_alloc.c b/libxfs/xfs_alloc.c
index 1d25d14f98b39a472d798e93f9c1d7ac7d801fa6..ec233d0d70a0298931985ba7690b0264bd0c7468 100644 (file)
--- a/libxfs/xfs_alloc.c
+++ b/libxfs/xfs_alloc.c
@@ -17,6 +17,7 @@
 #include "xfs_rmap.h"
 #include "xfs_alloc_btree.h"
 #include "xfs_alloc.h"
+#include "xfs_errortag.h"
 #include "xfs_trace.h"
 #include "xfs_trans.h"
 #include "xfs_ag_resv.h"

diff --git a/libxfs/xfs_alloc_btree.c b/libxfs/xfs_alloc_btree.c
index d39c973ab52a3632d1792528d04ec97027335e30..57327deb92587d8852c9fecb630f629000abbd97 100644 (file)
--- a/libxfs/xfs_alloc_btree.c
+++ b/libxfs/xfs_alloc_btree.c
@@ -7,6 +7,7 @@
 #include "xfs_fs.h"
 #include "xfs_shared.h"
 #include "xfs_format.h"
+#include "xfs_log_format.h"
 #include "xfs_trans_resv.h"
 #include "xfs_sb.h"
 #include "xfs_mount.h"
@@ -14,6 +15,7 @@
 #include "xfs_alloc_btree.h"
 #include "xfs_alloc.h"
 #include "xfs_trace.h"
+#include "xfs_trans.h"
 
 
 STATIC struct xfs_btree_cur *

diff --git a/libxfs/xfs_attr_leaf.c b/libxfs/xfs_attr_leaf.c
index 7f11de3e572af6bbf79d4f06e3c1fdc9cf218539..219736ac222f66be857e552a4cc71a4f3b28d2cd 100644 (file)
--- a/libxfs/xfs_attr_leaf.c
+++ b/libxfs/xfs_attr_leaf.c
@@ -13,6 +13,7 @@
 #include "xfs_sb.h"
 #include "xfs_mount.h"
 #include "xfs_da_format.h"
+#include "xfs_da_btree.h"
 #include "xfs_inode.h"
 #include "xfs_trans.h"
 #include "xfs_bmap_btree.h"

diff --git a/libxfs/xfs_bmap.c b/libxfs/xfs_bmap.c
index 0969f6550a439be6601f82b4f473c544faec17dd..5efa2f0cfff1b69168f94f139e85ebca666b9648 100644 (file)
--- a/libxfs/xfs_bmap.c
+++ b/libxfs/xfs_bmap.c
@@ -20,6 +20,7 @@
 #include "xfs_alloc.h"
 #include "xfs_bmap.h"
 #include "xfs_bmap_btree.h"
+#include "xfs_errortag.h"
 #include "xfs_trans_space.h"
 #include "xfs_trace.h"
 #include "xfs_attr_leaf.h"

diff --git a/libxfs/xfs_btree.c b/libxfs/xfs_btree.c
index 08a7e4eba3a76f73591ce71b4edb4fc8bec5a31d..aae1d30f89dd105273cebff68cbeafd9a228d113 100644 (file)
--- a/libxfs/xfs_btree.c
+++ b/libxfs/xfs_btree.c
@@ -14,7 +14,9 @@
 #include "xfs_inode.h"
 #include "xfs_trans.h"
 #include "xfs_btree.h"
+#include "xfs_errortag.h"
 #include "xfs_trace.h"
+#include "xfs_alloc.h"
 
 /*
  * Cursor allocation zone.

diff --git a/libxfs/xfs_defer.c b/libxfs/xfs_defer.c
index cff27a9b541daeea95718f3b08ba12ccb2e96af4..c7a536ac05f994a77b691ee5b7675dc0cc3235ac 100644 (file)
--- a/libxfs/xfs_defer.c
+++ b/libxfs/xfs_defer.c
@@ -6,9 +6,13 @@
 #include "libxfs_priv.h"
 #include "xfs_fs.h"
 #include "xfs_shared.h"
+#include "xfs_format.h"
 #include "xfs_log_format.h"
+#include "xfs_trans_resv.h"
+#include "xfs_mount.h"
 #include "xfs_defer.h"
 #include "xfs_trans.h"
+#include "xfs_inode.h"
 #include "xfs_trace.h"
 
 /*

diff --git a/libxfs/xfs_dir2.c b/libxfs/xfs_dir2.c
index 9a104a76244f1f120c9071197711adf661b21a25..31ac89a3629af2da6448e869faa3186cd6022475 100644 (file)
--- a/libxfs/xfs_dir2.c
+++ b/libxfs/xfs_dir2.c
@@ -15,6 +15,7 @@
 #include "xfs_bmap.h"
 #include "xfs_dir2.h"
 #include "xfs_dir2_priv.h"
+#include "xfs_errortag.h"
 #include "xfs_trace.h"
 
 struct xfs_name xfs_name_dotdot = { (unsigned char *)"..", 2, XFS_DIR3_FT_DIR };

diff --git a/libxfs/xfs_dquot_buf.c b/libxfs/xfs_dquot_buf.c
index 4a175bc307cd0297db7eeef3c30c8fdb5deaa220..5b372a23ce215796c55f29948aed760f5b773784 100644 (file)
--- a/libxfs/xfs_dquot_buf.c
+++ b/libxfs/xfs_dquot_buf.c
@@ -8,9 +8,12 @@
 #include "xfs_fs.h"
 #include "xfs_shared.h"
 #include "xfs_format.h"
+#include "xfs_log_format.h"
 #include "xfs_trans_resv.h"
 #include "xfs_mount.h"
 #include "xfs_quota_defs.h"
+#include "xfs_inode.h"
+#include "xfs_trans.h"
 
 int
 xfs_calc_dquots_per_chunk(

diff --git a/libxfs/xfs_ialloc.c b/libxfs/xfs_ialloc.c
index 23bcc8c9bc5a7b89833e7faf8bb5092f949a033b..baa9955192e39fed9cb8dc8f65715605afd967e5 100644 (file)
--- a/libxfs/xfs_ialloc.c
+++ b/libxfs/xfs_ialloc.c
@@ -17,6 +17,7 @@
 #include "xfs_ialloc.h"
 #include "xfs_ialloc_btree.h"
 #include "xfs_alloc.h"
+#include "xfs_errortag.h"
 #include "xfs_bmap.h"
 #include "xfs_trans.h"
 #include "xfs_trace.h"

diff --git a/libxfs/xfs_iext_tree.c b/libxfs/xfs_iext_tree.c
index 568fb33b931b9c8c460530e7d26bb2092ba4d5c0..f68091dc65a083c880669f35782242c49e7383ae 100644 (file)
--- a/libxfs/xfs_iext_tree.c
+++ b/libxfs/xfs_iext_tree.c
@@ -3,14 +3,14 @@
  * Copyright (c) 2017 Christoph Hellwig.
  */
 
-// #include <linux/cache.h>
-// #include <linux/kernel.h>
-// #include <linux/slab.h>
 #include "libxfs_priv.h"
+#include "xfs_shared.h"
 #include "xfs_format.h"
 #include "xfs_bit.h"
 #include "xfs_log_format.h"
 #include "xfs_inode.h"
+#include "xfs_trans_resv.h"
+#include "xfs_mount.h"
 #include "xfs_trace.h"
 
 /*

diff --git a/libxfs/xfs_inode_buf.c b/libxfs/xfs_inode_buf.c
index 4c90e19802e50d2cb30bd3e28efd4747e41da668..c0cb56763716a70f8f70f10dafa5677a98a58d9b 100644 (file)
--- a/libxfs/xfs_inode_buf.c
+++ b/libxfs/xfs_inode_buf.c
@@ -11,6 +11,7 @@
 #include "xfs_trans_resv.h"
 #include "xfs_mount.h"
 #include "xfs_inode.h"
+#include "xfs_errortag.h"
 #include "xfs_trans.h"
 #include "xfs_ialloc.h"
 #include "xfs_dir2.h"

diff --git a/libxfs/xfs_inode_fork.c b/libxfs/xfs_inode_fork.c
index a4b5686e041dfe0b807eecd994e8423f60ac9951..819faa6336a8440d428cf560af948765f3da0a27 100644 (file)
--- a/libxfs/xfs_inode_fork.c
+++ b/libxfs/xfs_inode_fork.c
@@ -3,6 +3,7 @@
  * Copyright (c) 2000-2006 Silicon Graphics, Inc.
  * All Rights Reserved.
  */
+
 #include "libxfs_priv.h"
 #include "xfs_fs.h"
 #include "xfs_shared.h"
@@ -21,7 +22,6 @@
 #include "xfs_dir2_priv.h"
 #include "xfs_attr_leaf.h"
 
-
 kmem_zone_t *xfs_ifork_zone;
 
 STATIC int xfs_iformat_local(xfs_inode_t *, xfs_dinode_t *, int, int);

diff --git a/libxfs/xfs_refcount.c b/libxfs/xfs_refcount.c
index 5149b0f7880c439411d5753a366908a8ce578ea6..71d2948651b2487d90b392e4b4e1d8cfe5c8ac98 100644 (file)
--- a/libxfs/xfs_refcount.c
+++ b/libxfs/xfs_refcount.c
@@ -15,6 +15,7 @@
 #include "xfs_bmap.h"
 #include "xfs_refcount_btree.h"
 #include "xfs_alloc.h"
+#include "xfs_errortag.h"
 #include "xfs_trace.h"
 #include "xfs_trans.h"
 #include "xfs_bit.h"

diff --git a/libxfs/xfs_refcount_btree.c b/libxfs/xfs_refcount_btree.c
index a52b50c381b3eadbec63e1f3e18301d1f173633d..c1561325bf254cf705ff5c7bfe42546af6ff820c 100644 (file)
--- a/libxfs/xfs_refcount_btree.c
+++ b/libxfs/xfs_refcount_btree.c
@@ -16,6 +16,7 @@
 #include "xfs_alloc.h"
 #include "xfs_trace.h"
 #include "xfs_trans.h"
+#include "xfs_bit.h"
 #include "xfs_rmap.h"
 
 static struct xfs_btree_cur *

diff --git a/libxfs/xfs_rmap.c b/libxfs/xfs_rmap.c
index 69a14d66039d00b43252ba09eb1696929b3ceef0..10a17e41443a78041e67e2913e5cce5eef29ab98 100644 (file)
--- a/libxfs/xfs_rmap.c
+++ b/libxfs/xfs_rmap.c
@@ -18,6 +18,7 @@
 #include "xfs_rmap.h"
 #include "xfs_rmap_btree.h"
 #include "xfs_trace.h"
+#include "xfs_errortag.h"
 #include "xfs_inode.h"
 
 /*

diff --git a/libxfs/xfs_trans_resv.c b/libxfs/xfs_trans_resv.c
index f0b48a7df29ea397719abad26ec491653bd8fe04..5f3279d47f807d698d33d2af0edb76230eab6739 100644 (file)
--- a/libxfs/xfs_trans_resv.c
+++ b/libxfs/xfs_trans_resv.c
@@ -13,6 +13,7 @@
 #include "xfs_mount.h"
 #include "xfs_da_format.h"
 #include "xfs_da_btree.h"
+#include "xfs_inode.h"
 #include "xfs_bmap_btree.h"
 #include "xfs_trans.h"
 #include "xfs_trans_space.h"