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 178ef3bbec6a01ac154fa0969f7e96e429d6e54a..e85d2cc60155ce0a96725d1816293f7efd6f366d 100644 (file)
--- a/fs/xfs/xfs_rtalloc.c
+++ b/fs/xfs/xfs_rtalloc.c
@@ -1284,7 +1284,9 @@ xfs_growfs_rt(
 
        /* Unsupported realtime features. */
        error = -EOPNOTSUPP;
-       if (xfs_has_rmapbt(mp) || xfs_has_reflink(mp) || xfs_has_quota(mp))
+       if (!xfs_has_rtgroups(mp) && xfs_has_rmapbt(mp))
+               goto out_unlock;
+       if (xfs_has_reflink(mp) || xfs_has_quota(mp))
                goto out_unlock;
 
        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 1e0399f56e59eaf416448f5d187aed10c5d577e5..5b1288830f1a150b88a724ef6d743b8e92a6d39f 100644 (file)
--- a/fs/xfs/xfs_super.c
+++ b/fs/xfs/xfs_super.c
@@ -1758,12 +1758,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,