xfs: add realtime refcount btree inode to metadata directory

Source kernel commit: 2a935930d4ffea7f2fab2a0305727e858ebf6487

Add a metadir path to select the realtime refcount btree inode and load
it at mount time.  The rtrefcountbt inode will have a unique extent format
code, which means that we also have to update the inode validation and
flush routines to look for it.

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

diff --git a/libxfs/xfs_format.h b/libxfs/xfs_format.h
index 1059f412fd4fc84ea3958a19fcd155af47dc09da..b037d51aa67ab38cf84e1dc60ad8461e754e7dc5 100644 (file)
--- a/libxfs/xfs_format.h
+++ b/libxfs/xfs_format.h
@@ -868,6 +868,7 @@ enum xfs_metafile_type {
        XFS_METAFILE_RTBITMAP,          /* rt bitmap */
        XFS_METAFILE_RTSUMMARY,         /* rt summary */
        XFS_METAFILE_RTRMAP,            /* rt rmap */
+       XFS_METAFILE_RTREFCOUNT,        /* rt refcount */
 
        XFS_METAFILE_MAX
 };
@@ -880,7 +881,8 @@ enum xfs_metafile_type {
        { XFS_METAFILE_PRJQUOTA,        "prjquota" }, \
        { XFS_METAFILE_RTBITMAP,        "rtbitmap" }, \
        { XFS_METAFILE_RTSUMMARY,       "rtsummary" }, \
-       { XFS_METAFILE_RTRMAP,          "rtrmap" }
+       { XFS_METAFILE_RTRMAP,          "rtrmap" }, \
+       { XFS_METAFILE_RTRMAP,          "rtrefcount" }
 
 /*
  * On-disk inode structure.
@@ -1014,6 +1016,7 @@ enum xfs_dinode_fmt {
        XFS_DINODE_FMT_BTREE,           /* struct xfs_bmdr_block */
        XFS_DINODE_FMT_UUID,            /* added long ago, but never used */
        XFS_DINODE_FMT_RMAP,            /* reverse mapping btree */
+       XFS_DINODE_FMT_REFCOUNT,        /* reference count btree */
 };
 
 #define XFS_INODE_FORMAT_STR \
@@ -1022,7 +1025,8 @@ enum xfs_dinode_fmt {
        { XFS_DINODE_FMT_EXTENTS,       "extent" }, \
        { XFS_DINODE_FMT_BTREE,         "btree" }, \
        { XFS_DINODE_FMT_UUID,          "uuid" }, \
-       { XFS_DINODE_FMT_RMAP,          "rmap" }
+       { XFS_DINODE_FMT_RMAP,          "rmap" }, \
+       { XFS_DINODE_FMT_REFCOUNT,      "refcount" }
 
 /*
  * Max values for extnum and aextnum.

diff --git a/libxfs/xfs_inode_buf.c b/libxfs/xfs_inode_buf.c
index 40421629fa8afd0aa0ac85e6a91db6fdf991a344..5995b1be4483904d570474ddd67378a17f1b29d1 100644 (file)
--- a/libxfs/xfs_inode_buf.c
+++ b/libxfs/xfs_inode_buf.c
@@ -442,6 +442,12 @@ xfs_dinode_verify_fork(
                if (!(dip->di_flags2 & cpu_to_be64(XFS_DIFLAG2_METADATA)))
                        return __this_address;
                break;
+       case XFS_DINODE_FMT_REFCOUNT:
+               if (!xfs_has_rtreflink(mp))
+                       return __this_address;
+               if (!(dip->di_flags2 & cpu_to_be64(XFS_DIFLAG2_METADATA)))
+                       return __this_address;
+               break;
        default:
                return __this_address;
        }
@@ -462,6 +468,7 @@ xfs_dinode_verify_forkoff(
                        return __this_address;
                break;
        case XFS_DINODE_FMT_RMAP:
+       case XFS_DINODE_FMT_REFCOUNT:
                if (!(xfs_has_metadir(mp) && xfs_has_parent(mp)))
                        return __this_address;
                fallthrough;
@@ -746,6 +753,7 @@ xfs_dinode_verify(
        if (flags2 & XFS_DIFLAG2_METADATA) {
                switch (XFS_DFORK_FORMAT(dip, XFS_DATA_FORK)) {
                case XFS_DINODE_FMT_RMAP:
+               case XFS_DINODE_FMT_REFCOUNT:
                        break;
                default:
                        if (nextents + naextents == 0 && nblocks != 0)

diff --git a/libxfs/xfs_inode_fork.c b/libxfs/xfs_inode_fork.c
index b2a5a155236fa4981bc3874fd8731c7da1518516..5d91ec516a6bc427ca4250def590cf44ed895256 100644 (file)
--- a/libxfs/xfs_inode_fork.c
+++ b/libxfs/xfs_inode_fork.c
@@ -273,6 +273,11 @@ xfs_iformat_data_fork(
                                return -EFSCORRUPTED;
                        }
                        return xfs_iformat_rtrmap(ip, dip);
+               case XFS_DINODE_FMT_REFCOUNT:
+                       if (!xfs_has_rtreflink(ip->i_mount))
+                               return -EFSCORRUPTED;
+                       ASSERT(0); /* to be implemented later */
+                       return -EFSCORRUPTED;
                default:
                        xfs_inode_verifier_error(ip, -EFSCORRUPTED, __func__,
                                        dip, sizeof(*dip), __this_address);
@@ -665,6 +670,10 @@ xfs_iflush_fork(
                        xfs_iflush_rtrmap(ip, dip);
                break;
 
+       case XFS_DINODE_FMT_REFCOUNT:
+               ASSERT(0); /* to be implemented later */
+               break;
+
        default:
                ASSERT(0);
                break;

diff --git a/libxfs/xfs_rtgroup.c b/libxfs/xfs_rtgroup.c
index fdefe3b1a2e235bde48e16fdbe54d682cf9463dd..84c9afb7fa98e54f9c8d3abbc7af9f6459694145 100644 (file)
--- a/libxfs/xfs_rtgroup.c
+++ b/libxfs/xfs_rtgroup.c
@@ -331,6 +331,9 @@ xfs_rtginode_ilock_print_fn(
        case XFS_DINODE_FMT_RMAP:
                printk(KERN_CONT " rgno=%u rmapbt", ip->i_projid);
                break;
+       case XFS_DINODE_FMT_REFCOUNT:
+               printk(KERN_CONT " rgno=%u refcountbt", ip->i_projid);
+               break;
        default:
                printk(KERN_CONT " rgno=%u", ip->i_projid);
                break;
@@ -398,6 +401,12 @@ static const struct xfs_rtginode_ops xfs_rtginode_ops[XFS_RTG_MAX] = {
                .enabled        = xfs_has_rtrmapbt,
                .create         = xfs_rtrmapbt_create,
        },
+       [XFS_RTG_REFCOUNT] = {
+               .name           = "refcount",
+               .metafile_type  = XFS_METAFILE_RTREFCOUNT,
+               .format         = XFS_DINODE_FMT_REFCOUNT,
+               .enabled        = xfs_has_rtreflink,
+       },
 };
 
 /* Return the shortname of this rtgroup inode. */

diff --git a/libxfs/xfs_rtgroup.h b/libxfs/xfs_rtgroup.h
index 839b0094fbb9e4f5323fe5f54162b17361274093..14edec52dac6dfa672a3ac6a36fe4229f25db377 100644 (file)
--- a/libxfs/xfs_rtgroup.h
+++ b/libxfs/xfs_rtgroup.h
@@ -13,6 +13,7 @@ enum xfs_rtg_inodes {
        XFS_RTG_BITMAP,         /* allocation bitmap */
        XFS_RTG_SUMMARY,        /* allocation summary */
        XFS_RTG_RMAP,           /* rmap btree inode */
+       XFS_RTG_REFCOUNT,       /* refcount btree inode */
 
        XFS_RTG_MAX,
 };

diff --git a/libxfs/xfs_rtrefcount_btree.c b/libxfs/xfs_rtrefcount_btree.c
index fe851be7b28667ecf403842b0bdd73ede707e1eb..33399260045dd8b7e192a8fac6bc7971f7b50dfc 100644 (file)
--- a/libxfs/xfs_rtrefcount_btree.c
+++ b/libxfs/xfs_rtrefcount_btree.c
@@ -24,6 +24,7 @@
 #include "xfs_cksum.h"
 #include "xfs_rtgroup.h"
 #include "xfs_rtbitmap.h"
+#include "xfs_metafile.h"
 
 static struct kmem_cache       *xfs_rtrefcountbt_cur_cache;
 
@@ -318,6 +319,7 @@ xfs_rtrefcountbt_commit_staged_btree(
        int                     flags = XFS_ILOG_CORE | XFS_ILOG_DBROOT;
 
        ASSERT(cur->bc_flags & XFS_BTREE_STAGING);
+       ASSERT(ifake->if_fork->if_format == XFS_DINODE_FMT_REFCOUNT);
 
        /*
         * Free any resources hanging off the real fork, then shallow-copy the