From: Eric Sandeen Date: Thu, 30 Jan 2020 16:43:39 +0000 (-0500) Subject: libxfs: move header includes closer to kernelspace X-Git-Tag: v5.5.0-rc1~64 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2cf10e4cf9e7ff203669d528dc015eb000242161;p=thirdparty%2Fxfsprogs-dev.git 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 Reviewed-by: Darrick J. Wong Reviewed-by: Christoph Hellwig Signed-off-by: Eric Sandeen --- diff --git a/libxfs/xfs_ag_resv.c b/libxfs/xfs_ag_resv.c index 1fe13bf44..530455a51 100644 --- 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 1d25d14f9..ec233d0d7 100644 --- 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 d39c973ab..57327deb9 100644 --- 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 7f11de3e5..219736ac2 100644 --- 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 0969f6550..5efa2f0cf 100644 --- 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 08a7e4eba..aae1d30f8 100644 --- 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 cff27a9b5..c7a536ac0 100644 --- 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 9a104a762..31ac89a36 100644 --- 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 4a175bc30..5b372a23c 100644 --- 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 23bcc8c9b..baa995519 100644 --- 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 568fb33b9..f68091dc6 100644 --- a/libxfs/xfs_iext_tree.c +++ b/libxfs/xfs_iext_tree.c @@ -3,14 +3,14 @@ * Copyright (c) 2017 Christoph Hellwig. */ -// #include -// #include -// #include #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 4c90e1980..c0cb56763 100644 --- 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 a4b5686e0..819faa633 100644 --- 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 5149b0f78..71d294865 100644 --- 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 a52b50c38..c1561325b 100644 --- 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 69a14d660..10a17e414 100644 --- 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 f0b48a7df..5f3279d47 100644 --- 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"