xfs: remove XFS_IFBROOT

Source kernel commit: ac1e067211d1476dae304e8881c10b40c90614d5

Just check for a btree format fork instead of the using the equivalent
in-memory XFS_IFBROOT flag.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
Signed-off-by: Darrick J. Wong <djwong@kernel.org>
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>

diff --git a/libxfs/xfs_bmap.c b/libxfs/xfs_bmap.c
index b377488ad8193f6192cfebc8cb037afa7d8bacae..15137cf0dca49284484f1702724450f0dab29490 100644 (file)
--- a/libxfs/xfs_bmap.c
+++ b/libxfs/xfs_bmap.c
@@ -626,7 +626,6 @@ xfs_bmap_btree_to_extents(
                cur->bc_bufs[0] = NULL;
        xfs_iroot_realloc(ip, -1, whichfork);
        ASSERT(ifp->if_broot == NULL);
-       ASSERT((ifp->if_flags & XFS_IFBROOT) == 0);
        ifp->if_format = XFS_DINODE_FMT_EXTENTS;
        *logflagsp |= XFS_ILOG_CORE | xfs_ilog_fext(whichfork);
        return 0;
@@ -670,7 +669,6 @@ xfs_bmap_extents_to_btree(
         * to expand the root.
         */
        xfs_iroot_realloc(ip, 1, whichfork);
-       ifp->if_flags |= XFS_IFBROOT;
 
        /*
         * Fill in the root.
@@ -4189,7 +4187,7 @@ xfs_bmapi_allocate(
                        return error;
        }
 
-       if ((ifp->if_flags & XFS_IFBROOT) && !bma->cur)
+       if (ifp->if_format == XFS_DINODE_FMT_BTREE && !bma->cur)
                bma->cur = xfs_bmbt_init_cursor(mp, bma->tp, bma->ip, whichfork);
        /*
         * Bump the number of extents we've allocated
@@ -4262,7 +4260,7 @@ xfs_bmapi_convert_unwritten(
         * Modify (by adding) the state flag, if writing.
         */
        ASSERT(mval->br_blockcount <= len);
-       if ((ifp->if_flags & XFS_IFBROOT) && !bma->cur) {
+       if (ifp->if_format == XFS_DINODE_FMT_BTREE && !bma->cur) {
                bma->cur = xfs_bmbt_init_cursor(bma->ip->i_mount, bma->tp,
                                        bma->ip, whichfork);
        }
@@ -4725,7 +4723,7 @@ xfs_bmapi_remap(
        ip->i_nblocks += len;
        xfs_trans_log_inode(tp, ip, XFS_ILOG_CORE);
 
-       if (ifp->if_flags & XFS_IFBROOT) {
+       if (ifp->if_format == XFS_DINODE_FMT_BTREE) {
                cur = xfs_bmbt_init_cursor(mp, tp, ip, whichfork);
                cur->bc_ino.flags = 0;
        }
@@ -5404,7 +5402,7 @@ __xfs_bunmapi(
        end--;
 
        logflags = 0;
-       if (ifp->if_flags & XFS_IFBROOT) {
+       if (ifp->if_format == XFS_DINODE_FMT_BTREE) {
                ASSERT(ifp->if_format == XFS_DINODE_FMT_BTREE);
                cur = xfs_bmbt_init_cursor(mp, tp, ip, whichfork);
                cur->bc_ino.flags = 0;
@@ -5878,7 +5876,7 @@ xfs_bmap_collapse_extents(
        if (error)
                return error;
 
-       if (ifp->if_flags & XFS_IFBROOT) {
+       if (ifp->if_format == XFS_DINODE_FMT_BTREE) {
                cur = xfs_bmbt_init_cursor(mp, tp, ip, whichfork);
                cur->bc_ino.flags = 0;
        }
@@ -5993,7 +5991,7 @@ xfs_bmap_insert_extents(
        if (error)
                return error;
 
-       if (ifp->if_flags & XFS_IFBROOT) {
+       if (ifp->if_format == XFS_DINODE_FMT_BTREE) {
                cur = xfs_bmbt_init_cursor(mp, tp, ip, whichfork);
                cur->bc_ino.flags = 0;
        }
@@ -6108,7 +6106,7 @@ xfs_bmap_split_extent(
        new.br_blockcount = got.br_blockcount - gotblkcnt;
        new.br_state = got.br_state;
 
-       if (ifp->if_flags & XFS_IFBROOT) {
+       if (ifp->if_format == XFS_DINODE_FMT_BTREE) {
                cur = xfs_bmbt_init_cursor(mp, tp, ip, whichfork);
                cur->bc_ino.flags = 0;
                error = xfs_bmbt_lookup_eq(cur, &got, &i);

diff --git a/libxfs/xfs_btree_staging.c b/libxfs/xfs_btree_staging.c
index fe17538de16e52891e39c5d3cdebe6e80305fc16..ace2eb7c33fb2c61f681960a3c3c656e252c0c2b 100644 (file)
--- a/libxfs/xfs_btree_staging.c
+++ b/libxfs/xfs_btree_staging.c
@@ -387,7 +387,6 @@ xfs_btree_bload_prep_block(
                new_size = bbl->iroot_size(cur, nr_this_block, priv);
                ifp->if_broot = kmem_zalloc(new_size, 0);
                ifp->if_broot_bytes = (int)new_size;
-               ifp->if_flags |= XFS_IFBROOT;
 
                /* Initialize it and send it out. */
                xfs_btree_init_block_int(cur->bc_mp, ifp->if_broot,

diff --git a/libxfs/xfs_inode_fork.c b/libxfs/xfs_inode_fork.c
index b1b6ac3f81a0cce6c3532504f65d5a8991e2fa10..dd863f25cc192d605adda0baf60604f1e5fc21fe 100644 (file)
--- a/libxfs/xfs_inode_fork.c
+++ b/libxfs/xfs_inode_fork.c
@@ -58,7 +58,7 @@ xfs_init_local_fork(
        }
 
        ifp->if_bytes = size;
-       ifp->if_flags &= ~(XFS_IFEXTENTS | XFS_IFBROOT);
+       ifp->if_flags &= ~XFS_IFEXTENTS;
        ifp->if_flags |= XFS_IFINLINE;
 }
 
@@ -212,7 +212,6 @@ xfs_iformat_btree(
        xfs_bmdr_to_bmbt(ip, dfp, XFS_DFORK_SIZE(dip, ip->i_mount, whichfork),
                         ifp->if_broot, size);
        ifp->if_flags &= ~XFS_IFEXTENTS;
-       ifp->if_flags |= XFS_IFBROOT;
 
        ifp->if_bytes = 0;
        ifp->if_u1.if_root = NULL;
@@ -431,7 +430,6 @@ xfs_iroot_realloc(
                        XFS_BMBT_BLOCK_LEN(ip->i_mount));
        } else {
                new_broot = NULL;
-               ifp->if_flags &= ~XFS_IFBROOT;
        }
 
        /*

diff --git a/libxfs/xfs_inode_fork.h b/libxfs/xfs_inode_fork.h
index 06682ff49a5bfcc1db066a33530131779622ccb0..8ffaa7cc1f7c3f246daf29871515bdcd229e102a 100644 (file)
--- a/libxfs/xfs_inode_fork.h
+++ b/libxfs/xfs_inode_fork.h
@@ -32,7 +32,6 @@ struct xfs_ifork {
  */
 #define        XFS_IFINLINE    0x01    /* Inline data is read in */
 #define        XFS_IFEXTENTS   0x02    /* All extent pointers are read in */
-#define        XFS_IFBROOT     0x04    /* i_broot points to the bmap b-tree root */
 
 /*
  * Worst-case increase in the fork extent count when we're adding a single