xfs: support the XFS_BTNUM_FINOBT free inode btree type

Define the AGI fields for the finobt root/level and add magic
numbers. Update the btree code to add support for the new
XFS_BTNUM_FINOBT inode btree.

The finobt root block is reserved immediately following the inobt
root block in the AG. Update XFS_PREALLOC_BLOCKS() to determine the
starting AG data block based on whether finobt support is enabled.

Signed-off-by: Brian Foster <bfoster@redhat.com>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>

1 files changed, 22 insertions, 14 deletions

diff --git a/fs/xfs/xfs_ag.h b/fs/xfs/xfs_ag.h
index 0fdd4109c624..6e247a99f5db 100644
--- a/fs/xfs/xfs_ag.h
+++ b/fs/xfs/xfs_ag.h
@@ -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))