xfs: add realtime refcount btree inode to metadata directory

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>

diff --git a/libxfs/xfs_format.h b/libxfs/xfs_format.h
index 70821d4a99fb51b41709e56ebe7bc676df321146..2261e8cb126b9e170f03de7faed5ba8f84b3ead3 100644 (file)
--- a/libxfs/xfs_format.h
+++ b/libxfs/xfs_format.h
@@ -887,6 +887,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
 } __packed;
@@ -899,7 +900,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.
@@ -1033,6 +1035,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 \
@@ -1041,7 +1044,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 bd72afad9698b367ccba6c4fd43a110f739aa767..b6d88892a32353223b8c18e204e14e275f1564d2 100644 (file)
--- a/libxfs/xfs_inode_buf.c
+++ b/libxfs/xfs_inode_buf.c
@@ -448,6 +448,13 @@ xfs_dinode_verify_fork(
                if (!(dip->di_flags2 & cpu_to_be64(XFS_DIFLAG2_METADATA)))
                        return __this_address;
                break;
+       case XFS_DINODE_FMT_REFCOUNT:
+               /* same comment about growfs and rmap inodes applies here */
+               if (!xfs_has_reflink(mp))
+                       return __this_address;
+               if (!(dip->di_flags2 & cpu_to_be64(XFS_DIFLAG2_METADATA)))
+                       return __this_address;
+               break;
        default:
                return __this_address;
        }
@@ -468,6 +475,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;
@@ -755,6 +763,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 ef4f52603499aca09c13c2b31db66c58b832c253..1868ac1d8b55f2d30e7d25f918685ce402f52386 100644 (file)
--- a/libxfs/xfs_inode_fork.c
+++ b/libxfs/xfs_inode_fork.c
@@ -278,6 +278,12 @@ xfs_iformat_data_fork(
                                return -EFSCORRUPTED;
                        }
                        return xfs_iformat_rtrmap(ip, dip);
+               case XFS_DINODE_FMT_REFCOUNT:
+                       /* same comment about growfs and rmap inodes applies */
+                       if (!xfs_has_reflink(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);
@@ -603,6 +609,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 bd6cc7bc70974b13b2ec7ab033553c29881c0120..1d68670b9bfa658b16b148d7b0e0fbc88fc701f4 100644 (file)
--- a/libxfs/xfs_rtgroup.c
+++ b/libxfs/xfs_rtgroup.c
@@ -276,6 +276,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;
@@ -353,6 +356,13 @@ static const struct xfs_rtginode_ops xfs_rtginode_ops[XFS_RTGI_MAX] = {
                .enabled        = xfs_has_rmapbt,
                .create         = xfs_rtrmapbt_create,
        },
+       [XFS_RTGI_REFCOUNT] = {
+               .name           = "refcount",
+               .metafile_type  = XFS_METAFILE_RTREFCOUNT,
+               .fmt_mask       = 1U << XFS_DINODE_FMT_REFCOUNT,
+               /* same comment about growfs and rmap inodes applies here */
+               .enabled        = xfs_has_reflink,
+       },
 };
 
 /* Return the shortname of this rtgroup inode. */

diff --git a/libxfs/xfs_rtgroup.h b/libxfs/xfs_rtgroup.h
index 5b485cf72ad7609d11b990f79a79c54865386089..a19f3637ebc0831ebb32d0b89dfd7d37c3d0df9c 100644 (file)
--- a/libxfs/xfs_rtgroup.h
+++ b/libxfs/xfs_rtgroup.h
@@ -15,6 +15,7 @@ enum xfs_rtg_inodes {
        XFS_RTGI_BITMAP,        /* allocation bitmap */
        XFS_RTGI_SUMMARY,       /* allocation summary */
        XFS_RTGI_RMAP,          /* rmap btree inode */
+       XFS_RTGI_REFCOUNT,      /* refcount btree inode */
 
        XFS_RTGI_MAX,
 };

diff --git a/libxfs/xfs_rtrefcount_btree.c b/libxfs/xfs_rtrefcount_btree.c
index ae5812ae665508ec3b4e2709e3178b6c2b5b4dec..ce36ba8b87df54596b47ac2b3730fffb2882a8dd 100644 (file)
--- a/libxfs/xfs_rtrefcount_btree.c
+++ b/libxfs/xfs_rtrefcount_btree.c
@@ -25,6 +25,7 @@
 #include "xfs_group.h"
 #include "xfs_rtgroup.h"
 #include "xfs_rtbitmap.h"
+#include "xfs_metafile.h"
 
 static struct kmem_cache       *xfs_rtrefcountbt_cur_cache;
 
@@ -315,6 +316,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