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

Commit b7676929 authored by Dave Chinner's avatar Dave Chinner
Browse files

Merge branch 'xfs-free-inode-btree' into for-next

parents 232c2f5c 53801fd9

fs/xfs/xfs_ag.h

+22 −14
Original line number Diff line number Diff line
@@ -160,30 +160,38 @@ typedef struct xfs_agi { 
	 * still being referenced.

	 */

	__be32		agi_unlinked[XFS_AGI_UNLINKED_BUCKETS];



	/*

	 * This marks the end of logging region 1 and start of logging region 2.

	 */

	uuid_t		agi_uuid;	/* uuid of filesystem */

	__be32		agi_crc;	/* crc of agi sector */

	__be32		agi_pad32;

	__be64		agi_lsn;	/* last write sequence */



	__be32		agi_free_root; /* root of the free inode btree */

	__be32		agi_free_level;/* levels in free inode btree */



	/* structure must be padded to 64 bit alignment */

} xfs_agi_t;



#define XFS_AGI_CRC_OFF		offsetof(struct xfs_agi, agi_crc)



#define	XFS_AGI_MAGICNUM	0x00000001

#define	XFS_AGI_VERSIONNUM	0x00000002

#define	XFS_AGI_SEQNO		0x00000004

#define	XFS_AGI_LENGTH		0x00000008

#define	XFS_AGI_COUNT		0x00000010

#define	XFS_AGI_ROOT		0x00000020

#define	XFS_AGI_LEVEL		0x00000040

#define	XFS_AGI_FREECOUNT	0x00000080

#define	XFS_AGI_NEWINO		0x00000100

#define	XFS_AGI_DIRINO		0x00000200

#define	XFS_AGI_UNLINKED	0x00000400

#define	XFS_AGI_NUM_BITS	11

#define	XFS_AGI_ALL_BITS	((1 << XFS_AGI_NUM_BITS) - 1)

#define	XFS_AGI_MAGICNUM	(1 << 0)

#define	XFS_AGI_VERSIONNUM	(1 << 1)

#define	XFS_AGI_SEQNO		(1 << 2)

#define	XFS_AGI_LENGTH		(1 << 3)

#define	XFS_AGI_COUNT		(1 << 4)

#define	XFS_AGI_ROOT		(1 << 5)

#define	XFS_AGI_LEVEL		(1 << 6)

#define	XFS_AGI_FREECOUNT	(1 << 7)

#define	XFS_AGI_NEWINO		(1 << 8)

#define	XFS_AGI_DIRINO		(1 << 9)

#define	XFS_AGI_UNLINKED	(1 << 10)

#define	XFS_AGI_NUM_BITS_R1	11	/* end of the 1st agi logging region */

#define	XFS_AGI_ALL_BITS_R1	((1 << XFS_AGI_NUM_BITS_R1) - 1)

#define	XFS_AGI_FREE_ROOT	(1 << 11)

#define	XFS_AGI_FREE_LEVEL	(1 << 12)

#define	XFS_AGI_NUM_BITS_R2	13



/* disk block (xfs_daddr_t) in the AG */

#define XFS_AGI_DADDR(mp)	((xfs_daddr_t)(2 << (mp)->m_sectbb_log))

fs/xfs/xfs_btree.c

+4 −2
Original line number Diff line number Diff line
@@ -43,9 +43,10 @@ kmem_zone_t *xfs_btree_cur_zone; 
 * Btree magic numbers.

 */

static const __uint32_t xfs_magics[2][XFS_BTNUM_MAX] = {

	{ XFS_ABTB_MAGIC, XFS_ABTC_MAGIC, XFS_BMAP_MAGIC, XFS_IBT_MAGIC },

	{ XFS_ABTB_MAGIC, XFS_ABTC_MAGIC, XFS_BMAP_MAGIC, XFS_IBT_MAGIC,

	  XFS_FIBT_MAGIC },

	{ XFS_ABTB_CRC_MAGIC, XFS_ABTC_CRC_MAGIC,

	  XFS_BMAP_CRC_MAGIC, XFS_IBT_CRC_MAGIC }

	  XFS_BMAP_CRC_MAGIC, XFS_IBT_CRC_MAGIC, XFS_FIBT_CRC_MAGIC }

};

#define xfs_btree_magic(cur) \

	xfs_magics[!!((cur)->bc_flags & XFS_BTREE_CRC_BLOCKS)][cur->bc_btnum]
@@ -1115,6 +1116,7 @@ xfs_btree_set_refs( 
		xfs_buf_set_ref(bp, XFS_ALLOC_BTREE_REF);

		break;

	case XFS_BTNUM_INO:

	case XFS_BTNUM_FINO:

		xfs_buf_set_ref(bp, XFS_INO_BTREE_REF);

		break;

	case XFS_BTNUM_BMAP:

fs/xfs/xfs_btree.h

+3 −0
Original line number Diff line number Diff line
@@ -62,6 +62,7 @@ union xfs_btree_rec { 
#define	XFS_BTNUM_CNT	((xfs_btnum_t)XFS_BTNUM_CNTi)

#define	XFS_BTNUM_BMAP	((xfs_btnum_t)XFS_BTNUM_BMAPi)

#define	XFS_BTNUM_INO	((xfs_btnum_t)XFS_BTNUM_INOi)

#define	XFS_BTNUM_FINO	((xfs_btnum_t)XFS_BTNUM_FINOi)



/*

 * For logging record fields.
@@ -92,6 +93,7 @@ do { \ 
	case XFS_BTNUM_CNT: __XFS_BTREE_STATS_INC(abtc, stat); break;	\

	case XFS_BTNUM_BMAP: __XFS_BTREE_STATS_INC(bmbt, stat); break;	\

	case XFS_BTNUM_INO: __XFS_BTREE_STATS_INC(ibt, stat); break;	\

	case XFS_BTNUM_FINO: __XFS_BTREE_STATS_INC(fibt, stat); break;	\

	case XFS_BTNUM_MAX: ASSERT(0); /* fucking gcc */ ; break;	\

	}       \

} while (0)
@@ -105,6 +107,7 @@ do { \ 
	case XFS_BTNUM_CNT: __XFS_BTREE_STATS_ADD(abtc, stat, val); break; \

	case XFS_BTNUM_BMAP: __XFS_BTREE_STATS_ADD(bmbt, stat, val); break; \

	case XFS_BTNUM_INO: __XFS_BTREE_STATS_ADD(ibt, stat, val); break; \

	case XFS_BTNUM_FINO: __XFS_BTREE_STATS_ADD(fibt, stat, val); break; \

	case XFS_BTNUM_MAX: ASSERT(0); /* fucking gcc */ ; break;	\

	}       \

} while (0)

fs/xfs/xfs_format.h

+13 −1
Original line number Diff line number Diff line
@@ -202,6 +202,8 @@ typedef __be32 xfs_alloc_ptr_t; 
 */

#define	XFS_IBT_MAGIC		0x49414254	/* 'IABT' */

#define	XFS_IBT_CRC_MAGIC	0x49414233	/* 'IAB3' */

#define	XFS_FIBT_MAGIC		0x46494254	/* 'FIBT' */

#define	XFS_FIBT_CRC_MAGIC	0x46494233	/* 'FIB3' */



typedef	__uint64_t	xfs_inofree_t;

#define	XFS_INODES_PER_CHUNK		(NBBY * sizeof(xfs_inofree_t))
@@ -244,7 +246,17 @@ typedef __be32 xfs_inobt_ptr_t; 
 * block numbers in the AG.

 */

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

#define	XFS_PREALLOC_BLOCKS(mp)		((xfs_agblock_t)(XFS_IBT_BLOCK(mp) + 1))

#define	XFS_FIBT_BLOCK(mp)		((xfs_agblock_t)(XFS_IBT_BLOCK(mp) + 1))



/*

 * The first data block of an AG depends on whether the filesystem was formatted

 * with the finobt feature. If so, account for the finobt reserved root btree

 * block.

 */

#define XFS_PREALLOC_BLOCKS(mp) \

	(xfs_sb_version_hasfinobt(&((mp)->m_sb)) ? \

	 XFS_FIBT_BLOCK(mp) + 1 : \

	 XFS_IBT_BLOCK(mp) + 1)

fs/xfs/xfs_fs.h

+1 −0
Original line number Diff line number Diff line
@@ -238,6 +238,7 @@ typedef struct xfs_fsop_resblks { 
#define XFS_FSOP_GEOM_FLAGS_LAZYSB	0x4000	/* lazy superblock counters */

#define XFS_FSOP_GEOM_FLAGS_V5SB	0x8000	/* version 5 superblock */

#define XFS_FSOP_GEOM_FLAGS_FTYPE	0x10000	/* inode directory types */

#define XFS_FSOP_GEOM_FLAGS_FINOBT	0x20000	/* free inode btree */



/*

 * Minimum and maximum sizes need for growth checks.