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/fs/xfs/libxfs/xfs_format.h b/fs/xfs/libxfs/xfs_format.h
index 70821d4a99fb51b41709e56ebe7bc676df321146..2261e8cb126b9e170f03de7faed5ba8f84b3ead3 100644 (file)
--- a/fs/xfs/libxfs/xfs_format.h
+++ b/fs/xfs/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/fs/xfs/libxfs/xfs_inode_buf.c b/fs/xfs/libxfs/xfs_inode_buf.c
index 701086e538c4ba832e113f700775297c81f352bb..68b9abc6a146895ded60740eb89c941a40138396 100644 (file)
--- a/fs/xfs/libxfs/xfs_inode_buf.c
+++ b/fs/xfs/libxfs/xfs_inode_buf.c
@@ -451,6 +451,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;
        }
@@ -471,6 +478,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;
@@ -758,6 +766,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/fs/xfs/libxfs/xfs_inode_fork.c b/fs/xfs/libxfs/xfs_inode_fork.c
index 5f0166c2f69ed1511b9039f348c3604c6b8a21de..6eb918e8b1ca08e0a6ad818659cf3776c12efce5 100644 (file)
--- a/fs/xfs/libxfs/xfs_inode_fork.c
+++ b/fs/xfs/libxfs/xfs_inode_fork.c
@@ -280,6 +280,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);
@@ -605,6 +611,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/fs/xfs/libxfs/xfs_rtgroup.c b/fs/xfs/libxfs/xfs_rtgroup.c
index e640422ef9b84f470f326db68f8d826d92fe9594..a12dccce716fd39465647a2ebf8eb49fe43bc2bf 100644 (file)
--- a/fs/xfs/libxfs/xfs_rtgroup.c
+++ b/fs/xfs/libxfs/xfs_rtgroup.c
@@ -279,6 +279,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;
@@ -356,6 +359,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/fs/xfs/libxfs/xfs_rtgroup.h b/fs/xfs/libxfs/xfs_rtgroup.h
index 5b485cf72ad7609d11b990f79a79c54865386089..a19f3637ebc0831ebb32d0b89dfd7d37c3d0df9c 100644 (file)
--- a/fs/xfs/libxfs/xfs_rtgroup.h
+++ b/fs/xfs/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/fs/xfs/libxfs/xfs_rtrefcount_btree.c b/fs/xfs/libxfs/xfs_rtrefcount_btree.c
index b697ed092b005026bf775ff3d5c0b1a0ac990054..0fb7c52c37a31ffa1267fef1797046d9d6354ddc 100644 (file)
--- a/fs/xfs/libxfs/xfs_rtrefcount_btree.c
+++ b/fs/xfs/libxfs/xfs_rtrefcount_btree.c
@@ -26,6 +26,7 @@
 #include "xfs_extent_busy.h"
 #include "xfs_rtgroup.h"
 #include "xfs_rtbitmap.h"
+#include "xfs_metafile.h"
 
 static struct kmem_cache       *xfs_rtrefcountbt_cur_cache;
 
@@ -281,12 +282,10 @@ xfs_rtrefcountbt_init_cursor(
        struct xfs_trans        *tp,
        struct xfs_rtgroup      *rtg)
 {
-       struct xfs_inode        *ip = NULL;
+       struct xfs_inode        *ip = rtg->rtg_inodes[XFS_RTGI_REFCOUNT];
        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,
@@ -316,6 +315,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

diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c
index 4fd2417b6afcc3fe23e3166258e11928bc01d6ab..de1a4a7e803b9f2b88b277851340e3775958fb20 100644 (file)
--- a/fs/xfs/xfs_inode.c
+++ b/fs/xfs/xfs_inode.c
@@ -2390,6 +2390,14 @@ xfs_iflush(
                                __func__, ip->i_ino, ip);
                        goto flush_out;
                }
+       } else if (ip->i_df.if_format == XFS_DINODE_FMT_REFCOUNT) {
+               if (!S_ISREG(VFS_I(ip)->i_mode) ||
+                   !(ip->i_diflags2 & XFS_DIFLAG2_METADATA)) {
+                       xfs_alert_tag(mp, XFS_PTAG_IFLUSH,
+                               "%s: Bad rt refcountbt inode %Lu, ptr "PTR_FMT,
+                               __func__, ip->i_ino, ip);
+                       goto flush_out;
+               }
        } else if (S_ISREG(VFS_I(ip)->i_mode)) {
                if (XFS_TEST_ERROR(
                    ip->i_df.if_format != XFS_DINODE_FMT_EXTENTS &&
@@ -2436,6 +2444,11 @@ xfs_iflush(
                                "%s: rt rmapbt in inode %Lu attr fork, ptr "PTR_FMT,
                                __func__, ip->i_ino, ip);
                        goto flush_out;
+               } else if (ip->i_af.if_format == XFS_DINODE_FMT_REFCOUNT) {
+                       xfs_alert_tag(mp, XFS_PTAG_IFLUSH,
+                               "%s: rt refcountbt in inode %Lu attr fork, ptr "PTR_FMT,
+                               __func__, ip->i_ino, ip);
+                       goto flush_out;
                }
        }
 

diff --git a/fs/xfs/xfs_inode_item.c b/fs/xfs/xfs_inode_item.c
index df7c834bc15f829bdbb0b01a46e3411c03527c23..1275e8a35ea4fddedfc696e32f62492435d45511 100644 (file)
--- a/fs/xfs/xfs_inode_item.c
+++ b/fs/xfs/xfs_inode_item.c
@@ -243,6 +243,7 @@ xfs_inode_item_data_fork_size(
                break;
        case XFS_DINODE_FMT_BTREE:
        case XFS_DINODE_FMT_RMAP:
+       case XFS_DINODE_FMT_REFCOUNT:
                if ((iip->ili_fields & XFS_ILOG_DBROOT) &&
                    ip->i_df.if_broot_bytes > 0) {
                        *nbytes += ip->i_df.if_broot_bytes;
@@ -364,6 +365,7 @@ xfs_inode_item_format_data_fork(
                break;
        case XFS_DINODE_FMT_BTREE:
        case XFS_DINODE_FMT_RMAP:
+       case XFS_DINODE_FMT_REFCOUNT:
                iip->ili_fields &=
                        ~(XFS_ILOG_DDATA | XFS_ILOG_DEXT | XFS_ILOG_DEV);
 

diff --git a/fs/xfs/xfs_inode_item_recover.c b/fs/xfs/xfs_inode_item_recover.c
index 26543e1b7599086a0045b9b3e22b8b52c0cab156..c3d5712f6bd3a201e3c54c35b776d7c68b2f43d1 100644 (file)
--- a/fs/xfs/xfs_inode_item_recover.c
+++ b/fs/xfs/xfs_inode_item_recover.c
@@ -424,6 +424,7 @@ xlog_recover_inode_commit_pass2(
        if (unlikely(S_ISREG(ldip->di_mode))) {
                if ((ldip->di_format != XFS_DINODE_FMT_EXTENTS) &&
                    (ldip->di_format != XFS_DINODE_FMT_RMAP) &&
+                   (ldip->di_format != XFS_DINODE_FMT_REFCOUNT) &&
                    (ldip->di_format != XFS_DINODE_FMT_BTREE)) {
                        XFS_CORRUPTION_ERROR(
                                "Bad log dinode data fork format for regular file",

diff --git a/fs/xfs/xfs_trace.h b/fs/xfs/xfs_trace.h
index 5cc928e11e28552c588ec9dba045ffc0e03f0a6f..a005735f6feccd01e5b0efee91485bc1148ef153 100644 (file)
--- a/fs/xfs/xfs_trace.h
+++ b/fs/xfs/xfs_trace.h
@@ -2301,6 +2301,7 @@ TRACE_DEFINE_ENUM(XFS_DINODE_FMT_EXTENTS);
 TRACE_DEFINE_ENUM(XFS_DINODE_FMT_BTREE);
 TRACE_DEFINE_ENUM(XFS_DINODE_FMT_UUID);
 TRACE_DEFINE_ENUM(XFS_DINODE_FMT_RMAP);
+TRACE_DEFINE_ENUM(XFS_DINODE_FMT_REFCOUNT);
 
 DECLARE_EVENT_CLASS(xfs_swap_extent_class,
        TP_PROTO(struct xfs_inode *ip, int which),