Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a4fbe6ab authored by Dave Chinner's avatar Dave Chinner Committed by Ben Myers
Browse files

xfs: decouple inode and bmap btree header files 



Currently the xfs_inode.h header has a dependency on the definition
of the BMAP btree records as the inode fork includes an array of
xfs_bmbt_rec_host_t objects in it's definition.

Move all the btree format definitions from xfs_btree.h,
xfs_bmap_btree.h, xfs_alloc_btree.h and xfs_ialloc_btree.h to
xfs_format.h to continue the process of centralising the on-disk
format definitions. With this done, the xfs inode definitions are no
longer dependent on btree header files.

The enables a massive culling of unnecessary includes, with close to
200 #include directives removed from the XFS kernel code base.

Signed-off-by: default avatarDave Chinner <dchinner@redhat.com>
Reviewed-by: default avatarBen Myers <bpm@sgi.com>
Signed-off-by: default avatarBen Myers <bpm@sgi.com>
parent 239880ef

fs/xfs/xfs_acl.c

+4 −4
Original line number Diff line number Diff line
@@ -16,15 +16,15 @@ 
 * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA

 */

#include "xfs.h"

#include "xfs_format.h"

#include "xfs_log_format.h"

#include "xfs_trans_resv.h"

#include "xfs_acl.h"

#include "xfs_attr.h"

#include "xfs_bmap_btree.h"

#include "xfs_inode.h"

#include "xfs_ag.h"

#include "xfs_sb.h"

#include "xfs_mount.h"

#include "xfs_inode.h"

#include "xfs_acl.h"

#include "xfs_attr.h"

#include "xfs_trace.h"

#include <linux/slab.h>

#include <linux/xattr.h>

fs/xfs/xfs_alloc.c

+1 −4
Original line number Diff line number Diff line
@@ -25,12 +25,9 @@ 
#include "xfs_sb.h"

#include "xfs_ag.h"

#include "xfs_mount.h"

#include "xfs_bmap_btree.h"

#include "xfs_alloc_btree.h"

#include "xfs_ialloc_btree.h"

#include "xfs_dinode.h"

#include "xfs_inode.h"

#include "xfs_btree.h"

#include "xfs_alloc_btree.h"

#include "xfs_alloc.h"

#include "xfs_extent_busy.h"

#include "xfs_error.h"

fs/xfs/xfs_alloc_btree.c

+2 −5
Original line number Diff line number Diff line
@@ -17,17 +17,14 @@ 
 */

#include "xfs.h"

#include "xfs_fs.h"

#include "xfs_format.h"

#include "xfs_log_format.h"

#include "xfs_trans_resv.h"

#include "xfs_sb.h"

#include "xfs_ag.h"

#include "xfs_mount.h"

#include "xfs_bmap_btree.h"

#include "xfs_alloc_btree.h"

#include "xfs_ialloc_btree.h"

#include "xfs_dinode.h"

#include "xfs_inode.h"

#include "xfs_btree.h"

#include "xfs_alloc_btree.h"

#include "xfs_alloc.h"

#include "xfs_extent_busy.h"

#include "xfs_error.h"

fs/xfs/xfs_alloc_btree.h

+0 −33
Original line number Diff line number Diff line
@@ -26,39 +26,6 @@ struct xfs_buf; 
struct xfs_btree_cur;

struct xfs_mount;



/*

 * There are two on-disk btrees, one sorted by blockno and one sorted

 * by blockcount and blockno.  All blocks look the same to make the code

 * simpler; if we have time later, we'll make the optimizations.

 */

#define	XFS_ABTB_MAGIC		0x41425442	/* 'ABTB' for bno tree */

#define	XFS_ABTB_CRC_MAGIC	0x41423342	/* 'AB3B' */

#define	XFS_ABTC_MAGIC		0x41425443	/* 'ABTC' for cnt tree */

#define	XFS_ABTC_CRC_MAGIC	0x41423343	/* 'AB3C' */



/*

 * Data record/key structure

 */

typedef struct xfs_alloc_rec {

	__be32		ar_startblock;	/* starting block number */

	__be32		ar_blockcount;	/* count of free blocks */

} xfs_alloc_rec_t, xfs_alloc_key_t;



typedef struct xfs_alloc_rec_incore {

	xfs_agblock_t	ar_startblock;	/* starting block number */

	xfs_extlen_t	ar_blockcount;	/* count of free blocks */

} xfs_alloc_rec_incore_t;



/* btree pointer type */

typedef __be32 xfs_alloc_ptr_t;



/*

 * Block numbers in the AG:

 * SB is sector 0, AGF is sector 1, AGI is sector 2, AGFL is sector 3.

 */

#define	XFS_BNO_BLOCK(mp)	((xfs_agblock_t)(XFS_AGFL_BLOCK(mp) + 1))

#define	XFS_CNT_BLOCK(mp)	((xfs_agblock_t)(XFS_BNO_BLOCK(mp) + 1))



/*

 * Btree block header size depends on a superblock flag.

 */

fs/xfs/xfs_aops.c

+2 −2
Original line number Diff line number Diff line
@@ -23,8 +23,6 @@ 
#include "xfs_sb.h"

#include "xfs_ag.h"

#include "xfs_mount.h"

#include "xfs_bmap_btree.h"

#include "xfs_dinode.h"

#include "xfs_inode.h"

#include "xfs_trans.h"

#include "xfs_inode_item.h"
@@ -34,6 +32,8 @@ 
#include "xfs_trace.h"

#include "xfs_bmap.h"

#include "xfs_bmap_util.h"

#include "xfs_bmap_btree.h"

#include "xfs_dinode.h"

#include <linux/aio.h>

#include <linux/gfp.h>

#include <linux/mpage.h>