]> www.infradead.org Git - users/hch/xfs.git/commitdiff
xfs: define the on-disk realtime refcount btree format
authorDarrick J. Wong <djwong@kernel.org>
Mon, 23 Sep 2024 20:42:23 +0000 (13:42 -0700)
committerChristoph Hellwig <hch@lst.de>
Wed, 9 Oct 2024 13:55:48 +0000 (15:55 +0200)
Start filling out the rtrefcount btree implementation. Start with the
on-disk btree format; add everything needed to read, write and
manipulate refcount btree blocks. This prepares the way for connecting
the btree operations implementation.

Signed-off-by: Darrick J. Wong <djwong@kernel.org>
12 files changed:
fs/xfs/Makefile
fs/xfs/libxfs/xfs_btree.c
fs/xfs/libxfs/xfs_format.h
fs/xfs/libxfs/xfs_ondisk.h
fs/xfs/libxfs/xfs_rtrefcount_btree.c [new file with mode: 0644]
fs/xfs/libxfs/xfs_rtrefcount_btree.h [new file with mode: 0644]
fs/xfs/libxfs/xfs_sb.c
fs/xfs/libxfs/xfs_shared.h
fs/xfs/xfs_mount.c
fs/xfs/xfs_mount.h
fs/xfs/xfs_stats.c
fs/xfs/xfs_stats.h

index 338e10f81b7b7194ff1b8fc39b36d93706fd6d5e..b9356d01416e1604239552de4dcd7e997f22d786 100644 (file)
@@ -51,6 +51,7 @@ xfs-y                         += $(addprefix libxfs/, \
                                   xfs_rmap_btree.o \
                                   xfs_refcount.o \
                                   xfs_refcount_btree.o \
+                                  xfs_rtrefcount_btree.o \
                                   xfs_rtrmap_btree.o \
                                   xfs_sb.o \
                                   xfs_symlink_remote.o \
index afe4b9b33775c005769ea264fa1480bd4c57103c..1760209856365a33ce6c89b006ce7ac4a2f9daf0 100644 (file)
@@ -35,6 +35,7 @@
 #include "xfs_rmap.h"
 #include "xfs_quota.h"
 #include "xfs_metafile.h"
+#include "xfs_rtrefcount_btree.h"
 
 /*
  * Btree magic numbers.
@@ -5533,6 +5534,9 @@ xfs_btree_init_cur_caches(void)
        if (error)
                goto err;
        error = xfs_rtrmapbt_init_cur_cache();
+       if (error)
+               goto err;
+       error = xfs_rtrefcountbt_init_cur_cache();
        if (error)
                goto err;
 
@@ -5552,6 +5556,7 @@ xfs_btree_destroy_cur_caches(void)
        xfs_rmapbt_destroy_cur_cache();
        xfs_refcountbt_destroy_cur_cache();
        xfs_rtrmapbt_destroy_cur_cache();
+       xfs_rtrefcountbt_destroy_cur_cache();
 }
 
 /* Move the btree cursor before the first record. */
index 3dfc4a43f6eb7fc83b20e1b837d8b2cea790731c..70821d4a99fb51b41709e56ebe7bc676df321146 100644 (file)
@@ -1820,6 +1820,9 @@ typedef __be32 xfs_refcount_ptr_t;
  */
 #define        XFS_RTREFC_CRC_MAGIC    0x52434e54      /* 'RCNT' */
 
+/* inode-rooted btree pointer type */
+typedef __be64 xfs_rtrefcount_ptr_t;
+
 /*
  * BMAP Btree format definitions
  *
index 8a0171860268041640adca462fed18844795c2ae..03023965dd5a703d2987fcf42fcb4c41385e3871 100644 (file)
@@ -79,6 +79,7 @@ xfs_check_ondisk_structs(void)
        XFS_CHECK_STRUCT_SIZE(struct xfs_rtbuf_blkinfo,         48);
        XFS_CHECK_STRUCT_SIZE(xfs_rtrmap_ptr_t,                 8);
        XFS_CHECK_STRUCT_SIZE(struct xfs_rtrmap_root,           4);
+       XFS_CHECK_STRUCT_SIZE(xfs_rtrefcount_ptr_t,             8);
 
        /*
         * m68k has problems with xfs_attr_leaf_name_remote_t, but we pad it to
diff --git a/fs/xfs/libxfs/xfs_rtrefcount_btree.c b/fs/xfs/libxfs/xfs_rtrefcount_btree.c
new file mode 100644 (file)
index 0000000..6aa2da5
--- /dev/null
@@ -0,0 +1,273 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ * Copyright (c) 2021-2024 Oracle.  All Rights Reserved.
+ * Author: Darrick J. Wong <djwong@kernel.org>
+ */
+#include "xfs.h"
+#include "xfs_fs.h"
+#include "xfs_shared.h"
+#include "xfs_format.h"
+#include "xfs_log_format.h"
+#include "xfs_trans_resv.h"
+#include "xfs_bit.h"
+#include "xfs_sb.h"
+#include "xfs_mount.h"
+#include "xfs_defer.h"
+#include "xfs_inode.h"
+#include "xfs_trans.h"
+#include "xfs_alloc.h"
+#include "xfs_btree.h"
+#include "xfs_btree_staging.h"
+#include "xfs_rtrefcount_btree.h"
+#include "xfs_trace.h"
+#include "xfs_cksum.h"
+#include "xfs_error.h"
+#include "xfs_extent_busy.h"
+#include "xfs_rtgroup.h"
+#include "xfs_rtbitmap.h"
+
+static struct kmem_cache       *xfs_rtrefcountbt_cur_cache;
+
+/*
+ * Realtime Reference Count btree.
+ *
+ * This is a btree used to track the owner(s) of a given extent in the realtime
+ * device.  See the comments in xfs_refcount_btree.c for more information.
+ *
+ * This tree is basically the same as the regular refcount btree except that
+ * it's rooted in an inode.
+ */
+
+static struct xfs_btree_cur *
+xfs_rtrefcountbt_dup_cursor(
+       struct xfs_btree_cur    *cur)
+{
+       return xfs_rtrefcountbt_init_cursor(cur->bc_tp, to_rtg(cur->bc_group));
+}
+
+static xfs_failaddr_t
+xfs_rtrefcountbt_verify(
+       struct xfs_buf          *bp)
+{
+       struct xfs_mount        *mp = bp->b_target->bt_mount;
+       struct xfs_btree_block  *block = XFS_BUF_TO_BLOCK(bp);
+       xfs_failaddr_t          fa;
+       int                     level;
+
+       if (!xfs_verify_magic(bp, block->bb_magic))
+               return __this_address;
+
+       if (!xfs_has_reflink(mp))
+               return __this_address;
+       fa = xfs_btree_fsblock_v5hdr_verify(bp, XFS_RMAP_OWN_UNKNOWN);
+       if (fa)
+               return fa;
+       level = be16_to_cpu(block->bb_level);
+       if (level > mp->m_rtrefc_maxlevels)
+               return __this_address;
+
+       return xfs_btree_fsblock_verify(bp, mp->m_rtrefc_mxr[level != 0]);
+}
+
+static void
+xfs_rtrefcountbt_read_verify(
+       struct xfs_buf  *bp)
+{
+       xfs_failaddr_t  fa;
+
+       if (!xfs_btree_fsblock_verify_crc(bp))
+               xfs_verifier_error(bp, -EFSBADCRC, __this_address);
+       else {
+               fa = xfs_rtrefcountbt_verify(bp);
+               if (fa)
+                       xfs_verifier_error(bp, -EFSCORRUPTED, fa);
+       }
+
+       if (bp->b_error)
+               trace_xfs_btree_corrupt(bp, _RET_IP_);
+}
+
+static void
+xfs_rtrefcountbt_write_verify(
+       struct xfs_buf  *bp)
+{
+       xfs_failaddr_t  fa;
+
+       fa = xfs_rtrefcountbt_verify(bp);
+       if (fa) {
+               trace_xfs_btree_corrupt(bp, _RET_IP_);
+               xfs_verifier_error(bp, -EFSCORRUPTED, fa);
+               return;
+       }
+       xfs_btree_fsblock_calc_crc(bp);
+
+}
+
+const struct xfs_buf_ops xfs_rtrefcountbt_buf_ops = {
+       .name                   = "xfs_rtrefcountbt",
+       .magic                  = { 0, cpu_to_be32(XFS_RTREFC_CRC_MAGIC) },
+       .verify_read            = xfs_rtrefcountbt_read_verify,
+       .verify_write           = xfs_rtrefcountbt_write_verify,
+       .verify_struct          = xfs_rtrefcountbt_verify,
+};
+
+const struct xfs_btree_ops xfs_rtrefcountbt_ops = {
+       .name                   = "rtrefcount",
+       .type                   = XFS_BTREE_TYPE_INODE,
+       .geom_flags             = XFS_BTGEO_IROOT_RECORDS,
+
+       .rec_len                = sizeof(struct xfs_refcount_rec),
+       .key_len                = sizeof(struct xfs_refcount_key),
+       .ptr_len                = XFS_BTREE_LONG_PTR_LEN,
+
+       .lru_refs               = XFS_REFC_BTREE_REF,
+       .statoff                = XFS_STATS_CALC_INDEX(xs_rtrefcbt_2),
+
+       .dup_cursor             = xfs_rtrefcountbt_dup_cursor,
+       .buf_ops                = &xfs_rtrefcountbt_buf_ops,
+};
+
+/* Allocate a new rt refcount btree cursor. */
+struct xfs_btree_cur *
+xfs_rtrefcountbt_init_cursor(
+       struct xfs_trans        *tp,
+       struct xfs_rtgroup      *rtg)
+{
+       struct xfs_inode        *ip = NULL;
+       struct xfs_mount        *mp = rtg_mount(rtg);
+       struct xfs_btree_cur    *cur;
+
+       return NULL; /* XXX */
+
+       xfs_assert_ilocked(ip, XFS_ILOCK_SHARED | XFS_ILOCK_EXCL);
+
+       cur = xfs_btree_alloc_cursor(mp, tp, &xfs_rtrefcountbt_ops,
+                       mp->m_rtrefc_maxlevels, xfs_rtrefcountbt_cur_cache);
+
+       cur->bc_ino.ip = ip;
+       cur->bc_refc.nr_ops = 0;
+       cur->bc_refc.shape_changes = 0;
+       cur->bc_group = xfs_group_hold(&rtg->rtg_group);
+       cur->bc_nlevels = be16_to_cpu(ip->i_df.if_broot->bb_level) + 1;
+       cur->bc_ino.forksize = xfs_inode_fork_size(ip, XFS_DATA_FORK);
+       cur->bc_ino.whichfork = XFS_DATA_FORK;
+       return cur;
+}
+
+/*
+ * Install a new rt reverse mapping btree root.  Caller is responsible for
+ * invalidating and freeing the old btree blocks.
+ */
+void
+xfs_rtrefcountbt_commit_staged_btree(
+       struct xfs_btree_cur    *cur,
+       struct xfs_trans        *tp)
+{
+       struct xbtree_ifakeroot *ifake = cur->bc_ino.ifake;
+       struct xfs_ifork        *ifp;
+       int                     flags = XFS_ILOG_CORE | XFS_ILOG_DBROOT;
+
+       ASSERT(cur->bc_flags & XFS_BTREE_STAGING);
+
+       /*
+        * Free any resources hanging off the real fork, then shallow-copy the
+        * staging fork's contents into the real fork to transfer everything
+        * we just built.
+        */
+       ifp = xfs_ifork_ptr(cur->bc_ino.ip, XFS_DATA_FORK);
+       xfs_idestroy_fork(ifp);
+       memcpy(ifp, ifake->if_fork, sizeof(struct xfs_ifork));
+
+       cur->bc_ino.ip->i_projid = cur->bc_group->xg_index;
+       xfs_trans_log_inode(tp, cur->bc_ino.ip, flags);
+       xfs_btree_commit_ifakeroot(cur, tp, XFS_DATA_FORK);
+}
+
+/* Calculate number of records in a realtime refcount btree block. */
+static inline unsigned int
+xfs_rtrefcountbt_block_maxrecs(
+       unsigned int            blocklen,
+       bool                    leaf)
+{
+
+       if (leaf)
+               return blocklen / sizeof(struct xfs_refcount_rec);
+       return blocklen / (sizeof(struct xfs_refcount_key) +
+                          sizeof(xfs_rtrefcount_ptr_t));
+}
+
+/*
+ * Calculate number of records in an refcount btree block.
+ */
+unsigned int
+xfs_rtrefcountbt_maxrecs(
+       struct xfs_mount        *mp,
+       unsigned int            blocklen,
+       bool                    leaf)
+{
+       blocklen -= XFS_RTREFCOUNT_BLOCK_LEN;
+       return xfs_rtrefcountbt_block_maxrecs(blocklen, leaf);
+}
+
+/* Compute the max possible height for realtime refcount btrees. */
+unsigned int
+xfs_rtrefcountbt_maxlevels_ondisk(void)
+{
+       unsigned int            minrecs[2];
+       unsigned int            blocklen;
+
+       blocklen = XFS_MIN_CRC_BLOCKSIZE - XFS_BTREE_LBLOCK_CRC_LEN;
+
+       minrecs[0] = xfs_rtrefcountbt_block_maxrecs(blocklen, true) / 2;
+       minrecs[1] = xfs_rtrefcountbt_block_maxrecs(blocklen, false) / 2;
+
+       /* We need at most one record for every block in an rt group. */
+       return xfs_btree_compute_maxlevels(minrecs, XFS_MAX_RGBLOCKS);
+}
+
+int __init
+xfs_rtrefcountbt_init_cur_cache(void)
+{
+       xfs_rtrefcountbt_cur_cache = kmem_cache_create("xfs_rtrefcountbt_cur",
+                       xfs_btree_cur_sizeof(
+                                       xfs_rtrefcountbt_maxlevels_ondisk()),
+                       0, 0, NULL);
+
+       if (!xfs_rtrefcountbt_cur_cache)
+               return -ENOMEM;
+       return 0;
+}
+
+void
+xfs_rtrefcountbt_destroy_cur_cache(void)
+{
+       kmem_cache_destroy(xfs_rtrefcountbt_cur_cache);
+       xfs_rtrefcountbt_cur_cache = NULL;
+}
+
+/* Compute the maximum height of a realtime refcount btree. */
+void
+xfs_rtrefcountbt_compute_maxlevels(
+       struct xfs_mount        *mp)
+{
+       unsigned int            d_maxlevels, r_maxlevels;
+
+       if (!xfs_has_rtreflink(mp)) {
+               mp->m_rtrefc_maxlevels = 0;
+               return;
+       }
+
+       /*
+        * The realtime refcountbt lives on the data device, which means that
+        * its maximum height is constrained by the size of the data device and
+        * the height required to store one refcount record for each rtextent
+        * in an rt group.
+        */
+       d_maxlevels = xfs_btree_space_to_height(mp->m_rtrefc_mnr,
+                               mp->m_sb.sb_dblocks);
+       r_maxlevels = xfs_btree_compute_maxlevels(mp->m_rtrefc_mnr,
+                               mp->m_sb.sb_rgextents);
+
+       /* Add one level to handle the inode root level. */
+       mp->m_rtrefc_maxlevels = min(d_maxlevels, r_maxlevels) + 1;
+}
diff --git a/fs/xfs/libxfs/xfs_rtrefcount_btree.h b/fs/xfs/libxfs/xfs_rtrefcount_btree.h
new file mode 100644 (file)
index 0000000..b713b33
--- /dev/null
@@ -0,0 +1,70 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+/*
+ * Copyright (c) 2021-2024 Oracle.  All Rights Reserved.
+ * Author: Darrick J. Wong <djwong@kernel.org>
+ */
+#ifndef __XFS_RTREFCOUNT_BTREE_H__
+#define __XFS_RTREFCOUNT_BTREE_H__
+
+struct xfs_buf;
+struct xfs_btree_cur;
+struct xfs_mount;
+struct xbtree_ifakeroot;
+struct xfs_rtgroup;
+
+/* refcounts only exist on crc enabled filesystems */
+#define XFS_RTREFCOUNT_BLOCK_LEN       XFS_BTREE_LBLOCK_CRC_LEN
+
+struct xfs_btree_cur *xfs_rtrefcountbt_init_cursor(struct xfs_trans *tp,
+               struct xfs_rtgroup *rtg);
+struct xfs_btree_cur *xfs_rtrefcountbt_stage_cursor(struct xfs_mount *mp,
+               struct xfs_rtgroup *rtg, struct xfs_inode *ip,
+               struct xbtree_ifakeroot *ifake);
+void xfs_rtrefcountbt_commit_staged_btree(struct xfs_btree_cur *cur,
+               struct xfs_trans *tp);
+unsigned int xfs_rtrefcountbt_maxrecs(struct xfs_mount *mp,
+               unsigned int blocklen, bool leaf);
+void xfs_rtrefcountbt_compute_maxlevels(struct xfs_mount *mp);
+
+/*
+ * Addresses of records, keys, and pointers within an incore rtrefcountbt block.
+ *
+ * (note that some of these may appear unused, but they are used in userspace)
+ */
+static inline struct xfs_refcount_rec *
+xfs_rtrefcount_rec_addr(
+       struct xfs_btree_block  *block,
+       unsigned int            index)
+{
+       return (struct xfs_refcount_rec *)
+               ((char *)block + XFS_RTREFCOUNT_BLOCK_LEN +
+                (index - 1) * sizeof(struct xfs_refcount_rec));
+}
+
+static inline struct xfs_refcount_key *
+xfs_rtrefcount_key_addr(
+       struct xfs_btree_block  *block,
+       unsigned int            index)
+{
+       return (struct xfs_refcount_key *)
+               ((char *)block + XFS_RTREFCOUNT_BLOCK_LEN +
+                (index - 1) * sizeof(struct xfs_refcount_key));
+}
+
+static inline xfs_rtrefcount_ptr_t *
+xfs_rtrefcount_ptr_addr(
+       struct xfs_btree_block  *block,
+       unsigned int            index,
+       unsigned int            maxrecs)
+{
+       return (xfs_rtrefcount_ptr_t *)
+               ((char *)block + XFS_RTREFCOUNT_BLOCK_LEN +
+                maxrecs * sizeof(struct xfs_refcount_key) +
+                (index - 1) * sizeof(xfs_rtrefcount_ptr_t));
+}
+
+unsigned int xfs_rtrefcountbt_maxlevels_ondisk(void);
+int __init xfs_rtrefcountbt_init_cur_cache(void);
+void xfs_rtrefcountbt_destroy_cur_cache(void);
+
+#endif /* __XFS_RTREFCOUNT_BTREE_H__ */
index 16292ac10f0166b7a3e0bdaf8e7d469f946424fc..014e1b50f57bfe47281d1cf39df6cf25e5582a8c 100644 (file)
@@ -29,6 +29,7 @@
 #include "xfs_exchrange.h"
 #include "xfs_rtgroup.h"
 #include "xfs_rtrmap_btree.h"
+#include "xfs_rtrefcount_btree.h"
 
 /*
  * Physical superblock buffer manipulations. Shared with libxfs in userspace.
@@ -1216,6 +1217,13 @@ xfs_sb_mount_common(
        mp->m_refc_mnr[0] = mp->m_refc_mxr[0] / 2;
        mp->m_refc_mnr[1] = mp->m_refc_mxr[1] / 2;
 
+       mp->m_rtrefc_mxr[0] = xfs_rtrefcountbt_maxrecs(mp, sbp->sb_blocksize,
+                       true);
+       mp->m_rtrefc_mxr[1] = xfs_rtrefcountbt_maxrecs(mp, sbp->sb_blocksize,
+                       false);
+       mp->m_rtrefc_mnr[0] = mp->m_rtrefc_mxr[0] / 2;
+       mp->m_rtrefc_mnr[1] = mp->m_rtrefc_mxr[1] / 2;
+
        mp->m_bsize = XFS_FSB_TO_BB(mp, 1);
        mp->m_alloc_set_aside = xfs_alloc_set_aside(mp);
        mp->m_ag_max_usable = xfs_alloc_ag_max_usable(mp);
index 960716c387cc2baf5bd6d665ed19cee5470fb362..b1e0d9bc1f7d7041d05e72821ec72f8f17822436 100644 (file)
@@ -42,6 +42,7 @@ extern const struct xfs_buf_ops xfs_rtbitmap_buf_ops;
 extern const struct xfs_buf_ops xfs_rtsummary_buf_ops;
 extern const struct xfs_buf_ops xfs_rtbuf_ops;
 extern const struct xfs_buf_ops xfs_rtsb_buf_ops;
+extern const struct xfs_buf_ops xfs_rtrefcountbt_buf_ops;
 extern const struct xfs_buf_ops xfs_rtrmapbt_buf_ops;
 extern const struct xfs_buf_ops xfs_sb_buf_ops;
 extern const struct xfs_buf_ops xfs_sb_quiet_buf_ops;
@@ -58,6 +59,7 @@ extern const struct xfs_btree_ops xfs_rmapbt_ops;
 extern const struct xfs_btree_ops xfs_rmapbt_mem_ops;
 extern const struct xfs_btree_ops xfs_rtrmapbt_ops;
 extern const struct xfs_btree_ops xfs_rtrmapbt_mem_ops;
+extern const struct xfs_btree_ops xfs_rtrefcountbt_ops;
 
 static inline bool xfs_btree_is_bno(const struct xfs_btree_ops *ops)
 {
@@ -114,6 +116,11 @@ static inline bool xfs_btree_is_rtrmap(const struct xfs_btree_ops *ops)
        return ops == &xfs_rtrmapbt_ops;
 }
 
+static inline bool xfs_btree_is_rtrefcount(const struct xfs_btree_ops *ops)
+{
+       return ops == &xfs_rtrefcountbt_ops;
+}
+
 /* log size calculation functions */
 int    xfs_log_calc_unit_res(struct xfs_mount *mp, int unit_bytes);
 int    xfs_log_calc_minimum_size(struct xfs_mount *);
index 64869e7a56019018508a377f41e606f2a9eeedfb..104808e0e038dc9f97662d74456e9f9dd85444c3 100644 (file)
@@ -38,6 +38,7 @@
 #include "xfs_metafile.h"
 #include "xfs_rtgroup.h"
 #include "xfs_rtrmap_btree.h"
+#include "xfs_rtrefcount_btree.h"
 #include "scrub/stats.h"
 
 static DEFINE_MUTEX(xfs_uuid_table_mutex);
@@ -656,7 +657,10 @@ static inline void
 xfs_rtbtree_compute_maxlevels(
        struct xfs_mount        *mp)
 {
-       mp->m_rtbtree_maxlevels = mp->m_rtrmap_maxlevels;
+       unsigned int            levels;
+
+       levels = max(mp->m_rtrmap_maxlevels, mp->m_rtrefc_maxlevels);
+       mp->m_rtbtree_maxlevels = levels;
 }
 
 /*
@@ -729,6 +733,7 @@ xfs_mountfs(
        xfs_rmapbt_compute_maxlevels(mp);
        xfs_rtrmapbt_compute_maxlevels(mp);
        xfs_refcountbt_compute_maxlevels(mp);
+       xfs_rtrefcountbt_compute_maxlevels(mp);
 
        xfs_agbtree_compute_maxlevels(mp);
        xfs_rtbtree_compute_maxlevels(mp);
index 561936c4a2d44e04d4eb753822eca6988890f91f..6fa691346681b8ccc720c56a62dfdbaa35249c79 100644 (file)
@@ -162,11 +162,14 @@ typedef struct xfs_mount {
        uint                    m_rtrmap_mnr[2]; /* min rtrmap btree records */
        uint                    m_refc_mxr[2];  /* max refc btree records */
        uint                    m_refc_mnr[2];  /* min refc btree records */
+       uint                    m_rtrefc_mxr[2]; /* max rtrefc btree records */
+       uint                    m_rtrefc_mnr[2]; /* min rtrefc btree records */
        uint                    m_alloc_maxlevels; /* max alloc btree levels */
        uint                    m_bm_maxlevels[2]; /* max bmap btree levels */
        uint                    m_rmap_maxlevels; /* max rmap btree levels */
        uint                    m_rtrmap_maxlevels; /* max rtrmap btree level */
        uint                    m_refc_maxlevels; /* max refcount btree level */
+       uint                    m_rtrefc_maxlevels; /* max rtrefc btree level */
        unsigned int            m_agbtree_maxlevels; /* max level of all AG btrees */
        unsigned int            m_rtbtree_maxlevels; /* max level of all rt btrees */
        xfs_extlen_t            m_ag_prealloc_blocks; /* reserved ag blocks */
@@ -408,6 +411,12 @@ static inline bool xfs_has_rtrmapbt(struct xfs_mount *mp)
               xfs_has_rmapbt(mp);
 }
 
+static inline bool xfs_has_rtreflink(struct xfs_mount *mp)
+{
+       return xfs_has_metadir(mp) && xfs_has_realtime(mp) &&
+              xfs_has_reflink(mp);
+}
+
 /*
  * Some features are always on for v5 file systems, allow the compiler to
  * eliminiate dead code when building without v4 support.
index 6355d8e2a6d2cced487635fc75bb9291d5065d1a..e7c69edc4a5ec863fe0a5d003b839add5eecf198 100644 (file)
@@ -54,7 +54,8 @@ int xfs_stats_format(struct xfsstats __percpu *stats, char *buf)
                { "rmapbt_mem",         xfsstats_offset(xs_rcbag_2)     },
                { "rcbagbt",            xfsstats_offset(xs_rtrmap_2)    },
                { "rtrmapbt",           xfsstats_offset(xs_rtrmap_mem_2)},
-               { "rtrmapbt_mem",       xfsstats_offset(xs_qm_dqreclaims)},
+               { "rtrmapbt_mem",       xfsstats_offset(xs_rtrefcbt_2)  },
+               { "rtrefcntbt",         xfsstats_offset(xs_qm_dqreclaims)},
                /* we print both series of quota information together */
                { "qm",                 xfsstats_offset(xs_xstrat_bytes)},
        };
index 9c47de5dff2dd63a4c6f6e216b5bd6c9c04bac8d..15ba1abcf2536f77a2d78be98ad4c10f4cb4ef67 100644 (file)
@@ -129,6 +129,7 @@ struct __xfsstats {
        uint32_t                xs_rcbag_2[__XBTS_MAX];
        uint32_t                xs_rtrmap_2[__XBTS_MAX];
        uint32_t                xs_rtrmap_mem_2[__XBTS_MAX];
+       uint32_t                xs_rtrefcbt_2[__XBTS_MAX];
        uint32_t                xs_qm_dqreclaims;
        uint32_t                xs_qm_dqreclaim_misses;
        uint32_t                xs_qm_dquot_dups;