xfs
[Top] [All Lists]

[PATCH 13/58] xfs: enhance rmap btree growfs support

To: david@xxxxxxxxxxxxx, darrick.wong@xxxxxxxxxx
Subject: [PATCH 13/58] xfs: enhance rmap btree growfs support
From: "Darrick J. Wong" <darrick.wong@xxxxxxxxxx>
Date: Tue, 06 Oct 2015 21:56:12 -0700
Cc: linux-fsdevel@xxxxxxxxxxxxxxx, xfs@xxxxxxxxxxx
Delivered-to: xfs@xxxxxxxxxxx
In-reply-to: <20151007045443.30457.47038.stgit@xxxxxxxxxxxxxxxx>
References: <20151007045443.30457.47038.stgit@xxxxxxxxxxxxxxxx>
User-agent: StGit/0.17.1-dirty
Fill out the rmap offset fields.

Signed-off-by: Darrick J. Wong <darrick.wong@xxxxxxxxxx>
---
 fs/xfs/xfs_fsops.c |    9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)


diff --git a/fs/xfs/xfs_fsops.c b/fs/xfs/xfs_fsops.c
index 38c78da..119be0a 100644
--- a/fs/xfs/xfs_fsops.c
+++ b/fs/xfs/xfs_fsops.c
@@ -393,6 +393,7 @@ xfs_growfs_data_private(
                if (xfs_sb_version_hasrmapbt(&mp->m_sb)) {
                        struct xfs_rmap_rec     *rrec;
                        struct xfs_btree_block  *block;
+
                        bp = xfs_growfs_get_hdr_buf(mp,
                                XFS_AGB_TO_DADDR(mp, agno, XFS_RMAP_BLOCK(mp)),
                                BTOBB(mp->m_sb.sb_blocksize), 0,
@@ -402,7 +403,7 @@ xfs_growfs_data_private(
                                goto error0;
                        }
 
-                       xfs_btree_init_block(mp, bp, XFS_RMAP_CRC_MAGIC, 0, 2,
+                       xfs_btree_init_block(mp, bp, XFS_RMAP_CRC_MAGIC, 0, 0,
                                                agno, XFS_BTREE_CRC_BLOCKS);
                        block = XFS_BUF_TO_BLOCK(bp);
 
@@ -420,6 +421,7 @@ xfs_growfs_data_private(
                        rrec->rm_startblock = 0;
                        rrec->rm_blockcount = cpu_to_be32(XFS_BNO_BLOCK(mp));
                        rrec->rm_owner = cpu_to_be64(XFS_RMAP_OWN_FS);
+                       rrec->rm_offset = 0;
                        be16_add_cpu(&block->bb_numrecs, 1);
 
                        /* account freespace btree root blocks */
@@ -427,6 +429,7 @@ xfs_growfs_data_private(
                        rrec->rm_startblock = cpu_to_be32(XFS_BNO_BLOCK(mp));
                        rrec->rm_blockcount = cpu_to_be32(2);
                        rrec->rm_owner = cpu_to_be64(XFS_RMAP_OWN_AG);
+                       rrec->rm_offset = 0;
                        be16_add_cpu(&block->bb_numrecs, 1);
 
                        /* account inode btree root blocks */
@@ -435,13 +438,15 @@ xfs_growfs_data_private(
                        rrec->rm_blockcount = cpu_to_be32(XFS_RMAP_BLOCK(mp) -
                                                        XFS_IBT_BLOCK(mp));
                        rrec->rm_owner = cpu_to_be64(XFS_RMAP_OWN_INOBT);
+                       rrec->rm_offset = 0;
                        be16_add_cpu(&block->bb_numrecs, 1);
 
-                       /* account for rmap btree root */ 
+                       /* account for rmap btree root */
                        rrec = XFS_RMAP_REC_ADDR(block, 4);
                        rrec->rm_startblock = cpu_to_be32(XFS_RMAP_BLOCK(mp));
                        rrec->rm_blockcount = cpu_to_be32(1);
                        rrec->rm_owner = cpu_to_be64(XFS_RMAP_OWN_AG);
+                       rrec->rm_offset = 0;
                        be16_add_cpu(&block->bb_numrecs, 1);
 
                        error = xfs_bwrite(bp);

<Prev in Thread] Current Thread [Next in Thread>