xfs: factor the ag length extension code into libxfs

Source kernel commit: 49dd56f26ea7d18d4ca71f43a082dbb92798ebd3

Growfs currently manually codes the extension of the last AG in a
filesytem during the growfs process. Factor that out of the growfs
code and move it into libxfs along with teh rest of the AG header
modification code.

Signed-Off-By: Dave Chinner <dchinner@redhat.com>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>

diff --git a/libxfs/xfs_ag.c b/libxfs/xfs_ag.c
index 501264631aa2288fbb372c1c5b13f511dc09da5f..76e660d730dca9c62da4544f37a28eb753bbb15e 100644 (file)
--- a/libxfs/xfs_ag.c
+++ b/libxfs/xfs_ag.c
@@ -17,6 +17,7 @@
 #include "xfs_alloc_btree.h"
 #include "xfs_rmap_btree.h"
 #include "xfs_alloc.h"
+#include "xfs_ialloc.h"
 #include "xfs_rmap.h"
 #include "xfs_ag.h"
 
@@ -403,3 +404,62 @@ xfs_ag_init_headers(
        }
        return error;
 }
+
+/*
+ * Extent the AG indicated by the @id by the length passed in
+ */
+int
+xfs_ag_extend_space(
+       struct xfs_mount        *mp,
+       struct xfs_trans        *tp,
+       struct aghdr_init_data  *id,
+       xfs_extlen_t            len)
+{
+       struct xfs_owner_info   oinfo;
+       struct xfs_buf          *bp;
+       struct xfs_agi          *agi;
+       struct xfs_agf          *agf;
+       int                     error;
+
+       /*
+        * Change the agi length.
+        */
+       error = xfs_ialloc_read_agi(mp, tp, id->agno, &bp);
+       if (error)
+               return error;
+
+       agi = XFS_BUF_TO_AGI(bp);
+       be32_add_cpu(&agi->agi_length, len);
+       ASSERT(id->agno == mp->m_sb.sb_agcount - 1 ||
+              be32_to_cpu(agi->agi_length) == mp->m_sb.sb_agblocks);
+       xfs_ialloc_log_agi(tp, bp, XFS_AGI_LENGTH);
+
+       /*
+        * Change agf length.
+        */
+       error = xfs_alloc_read_agf(mp, tp, id->agno, 0, &bp);
+       if (error)
+               return error;
+
+       agf = XFS_BUF_TO_AGF(bp);
+       be32_add_cpu(&agf->agf_length, len);
+       ASSERT(agf->agf_length == agi->agi_length);
+       xfs_alloc_log_agf(tp, bp, XFS_AGF_LENGTH);
+
+       /*
+        * Free the new space.
+        *
+        * XFS_RMAP_OWN_NULL is used here to tell the rmap btree that
+        * this doesn't actually exist in the rmap btree.
+        */
+       xfs_rmap_ag_owner(&oinfo, XFS_RMAP_OWN_NULL);
+       error = xfs_rmap_free(tp, bp, id->agno,
+                               be32_to_cpu(agf->agf_length) - len,
+                               len, &oinfo);
+       if (error)
+               return error;
+
+       return  xfs_free_extent(tp, XFS_AGB_TO_FSB(mp, id->agno,
+                                       be32_to_cpu(agf->agf_length) - len),
+                               len, &oinfo, XFS_AG_RESV_NONE);
+}

diff --git a/libxfs/xfs_ag.h b/libxfs/xfs_ag.h
index 69f2fd4be0eadb32b5ce6f3935db67b715446180..412702e23f614a4fda33cce74c7aaa6c01367894 100644 (file)
--- a/libxfs/xfs_ag.h
+++ b/libxfs/xfs_ag.h
@@ -7,6 +7,9 @@
 #ifndef __LIBXFS_AG_H
 #define __LIBXFS_AG_H 1
 
+struct xfs_mount;
+struct xfs_trans;
+
 struct aghdr_init_data {
        /* per ag data */
        xfs_agblock_t           agno;           /* ag to init */
@@ -20,6 +23,8 @@ struct aghdr_init_data {
        xfs_btnum_t             type;           /* type of btree root block */
 };
 
-int xfs_ag_init_headers( struct xfs_mount *mp, struct aghdr_init_data *id);
+int xfs_ag_init_headers(struct xfs_mount *mp, struct aghdr_init_data *id);
+int xfs_ag_extend_space(struct xfs_mount *mp, struct xfs_trans *tp,
+                       struct aghdr_init_data *id, xfs_extlen_t len);
 
 #endif /* __LIBXFS_AG_H */