xfs: enable realtime rmap btree

Signed-off-by: Darrick J. Wong <djwong@kernel.org>

diff --git a/fs/xfs/xfs_rtalloc.c b/fs/xfs/xfs_rtalloc.c
index 5936e7f14fa409a22739ac76b04297a7a52063f0..c5fbe4c8dc0c1149dba44bec462911a71651a51a 100644 (file)
--- a/fs/xfs/xfs_rtalloc.c
+++ b/fs/xfs/xfs_rtalloc.c
@@ -1235,7 +1235,9 @@ xfs_growfs_rt(
                return -EINVAL;
 
        /* Unsupported realtime features. */
-       if (xfs_has_rmapbt(mp) || xfs_has_reflink(mp) || xfs_has_quota(mp))
+       if (!xfs_has_rtgroups(mp) && xfs_has_rmapbt(mp))
+               return -EOPNOTSUPP;
+       if (xfs_has_reflink(mp) || xfs_has_quota(mp))
                return -EOPNOTSUPP;
 
        error = xfs_sb_validate_fsb_count(&mp->m_sb, in->newblocks);

diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c
index 1d45c5c575dab1ee19adbf09b96246e56f068801..febc1df8b6d3639a1acfd4e35d3421aef5851693 100644 (file)
--- a/fs/xfs/xfs_super.c
+++ b/fs/xfs/xfs_super.c
@@ -1755,12 +1755,6 @@ xfs_fs_fill_super(
                }
        }
 
-       if (xfs_has_rmapbt(mp) && mp->m_sb.sb_rblocks) {
-               xfs_alert(mp,
-       "reverse mapping btree not compatible with realtime device!");
-               error = -EINVAL;
-               goto out_filestream_unmount;
-       }
 
        if (xfs_has_exchange_range(mp))
                xfs_warn(mp,