xfs: compute maximum AG btree height for critical reservation calculation

Source kernel commit: b74e15d720d0764345934ebb599a99a077c52533

Compute the actual maximum AG btree height for deciding if a per-AG
block reservation is critically low.  This only affects the sanity check
condition, since we /generally/ will trigger on the 10% threshold.  This
is a long-winded way of saying that we're removing one more usage of
XFS_BTREE_MAXLEVELS.

Signed-off-by: Darrick J. Wong <djwong@kernel.org>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>

diff --git a/include/xfs_mount.h b/include/xfs_mount.h
index 4d77e6093a3a780d64527fe752ed7a8db4967ef8..2bd1332161bda7cb0c9f824b341c676766e2298a 100644 (file)
--- a/include/xfs_mount.h
+++ b/include/xfs_mount.h
@@ -75,6 +75,7 @@ typedef struct xfs_mount {
        uint                    m_bm_maxlevels[2];  /* max bmap btree levels */
        uint                    m_rmap_maxlevels; /* max rmap btree levels */
        uint                    m_refc_maxlevels; /* max refc btree levels */
+       unsigned int            m_agbtree_maxlevels; /* max level of all AG btrees */
        xfs_extlen_t            m_ag_prealloc_blocks; /* reserved ag blocks */
        uint                    m_alloc_set_aside; /* space we can't use */
        uint                    m_ag_max_usable; /* max space per AG */

diff --git a/libxfs/init.c b/libxfs/init.c
index 2d29a78adf2b5ad14ca4ab9baec47c480198ebad..d7df763265ea7bfe8b73983b965a0c3eec848b2a 100644 (file)
--- a/libxfs/init.c
+++ b/libxfs/init.c
@@ -706,6 +706,18 @@ libxfs_buftarg_init(
        mp->m_rtdev_targp = libxfs_buftarg_alloc(mp, rtdev, rfail);
 }
 
+/* Compute maximum possible height for per-AG btree types for this fs. */
+static inline void
+xfs_agbtree_compute_maxlevels(
+       struct xfs_mount        *mp)
+{
+       unsigned int            levels;
+
+       levels = max(mp->m_alloc_maxlevels, M_IGEO(mp)->inobt_maxlevels);
+       levels = max(levels, mp->m_rmap_maxlevels);
+       mp->m_agbtree_maxlevels = max(levels, mp->m_refc_maxlevels);
+}
+
 /*
  * Mount structure initialization, provides a filled-in xfs_mount_t
  * such that the numerous XFS_* macros can be used.  If dev is zero,
@@ -757,6 +769,8 @@ libxfs_mount(
        xfs_rmapbt_compute_maxlevels(mp);
        xfs_refcountbt_compute_maxlevels(mp);
 
+       xfs_agbtree_compute_maxlevels(mp);
+
        /*
         * Check that the data (and log if separate) are an ok size.
         */

diff --git a/libxfs/xfs_ag_resv.c b/libxfs/xfs_ag_resv.c
index b1392cda1c39d7dce9f5e7d0d5e4beb437129204..546f34e8b837431eb60d5991a2f2be59c8bd2243 100644 (file)
--- a/libxfs/xfs_ag_resv.c
+++ b/libxfs/xfs_ag_resv.c
@@ -90,7 +90,8 @@ xfs_ag_resv_critical(
        trace_xfs_ag_resv_critical(pag, type, avail);
 
        /* Critically low if less than 10% or max btree height remains. */
-       return XFS_TEST_ERROR(avail < orig / 10 || avail < XFS_BTREE_MAXLEVELS,
+       return XFS_TEST_ERROR(avail < orig / 10 ||
+                             avail < pag->pag_mount->m_agbtree_maxlevels,
                        pag->pag_mount, XFS_ERRTAG_AG_RESV_CRITICAL);
 }