aboutsummaryrefslogtreecommitdiffstats
path: root/fs/xfs/xfs_btree.c
diff options
context:
space:
mode:
authorDave Chinner <david@fromorbit.com>2014-05-14 19:37:44 -0400
committerDave Chinner <david@fromorbit.com>2014-05-14 19:37:44 -0400
commitb76769294ba400415fc44038c21cc2df86f9a28b (patch)
treea1ca6152391c86ae024e09d69e7b0ad75a5c61d5 /fs/xfs/xfs_btree.c
parent232c2f5c65dd80055e7163a5c82e3816119330e6 (diff)
parent53801fd97ae000793f51187b122b9475102199a8 (diff)
Merge branch 'xfs-free-inode-btree' into for-next
Diffstat (limited to 'fs/xfs/xfs_btree.c')
-rw-r--r--fs/xfs/xfs_btree.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/fs/xfs/xfs_btree.c b/fs/xfs/xfs_btree.c
index c13d650fdb99..182bac2bb276 100644
--- a/fs/xfs/xfs_btree.c
+++ b/fs/xfs/xfs_btree.c
@@ -43,9 +43,10 @@ kmem_zone_t *xfs_btree_cur_zone;
43 * Btree magic numbers. 43 * Btree magic numbers.
44 */ 44 */
45static const __uint32_t xfs_magics[2][XFS_BTNUM_MAX] = { 45static const __uint32_t xfs_magics[2][XFS_BTNUM_MAX] = {
46 { XFS_ABTB_MAGIC, XFS_ABTC_MAGIC, XFS_BMAP_MAGIC, XFS_IBT_MAGIC }, 46 { XFS_ABTB_MAGIC, XFS_ABTC_MAGIC, XFS_BMAP_MAGIC, XFS_IBT_MAGIC,
47 XFS_FIBT_MAGIC },
47 { XFS_ABTB_CRC_MAGIC, XFS_ABTC_CRC_MAGIC, 48 { XFS_ABTB_CRC_MAGIC, XFS_ABTC_CRC_MAGIC,
48 XFS_BMAP_CRC_MAGIC, XFS_IBT_CRC_MAGIC } 49 XFS_BMAP_CRC_MAGIC, XFS_IBT_CRC_MAGIC, XFS_FIBT_CRC_MAGIC }
49}; 50};
50#define xfs_btree_magic(cur) \ 51#define xfs_btree_magic(cur) \
51 xfs_magics[!!((cur)->bc_flags & XFS_BTREE_CRC_BLOCKS)][cur->bc_btnum] 52 xfs_magics[!!((cur)->bc_flags & XFS_BTREE_CRC_BLOCKS)][cur->bc_btnum]
@@ -1115,6 +1116,7 @@ xfs_btree_set_refs(
1115 xfs_buf_set_ref(bp, XFS_ALLOC_BTREE_REF); 1116 xfs_buf_set_ref(bp, XFS_ALLOC_BTREE_REF);
1116 break; 1117 break;
1117 case XFS_BTNUM_INO: 1118 case XFS_BTNUM_INO:
1119 case XFS_BTNUM_FINO:
1118 xfs_buf_set_ref(bp, XFS_INO_BTREE_REF); 1120 xfs_buf_set_ref(bp, XFS_INO_BTREE_REF);
1119 break; 1121 break;
1120 case XFS_BTNUM_BMAP: 1122 case XFS_BTNUM_BMAP: