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 b1665a2f3da0a55dfcb2316e97caf120aa186b5f..7b555b7f0d76ef9b53ffd60479fd2eb0702b94d1 100644 (file)
--- a/fs/xfs/xfs_rtalloc.c
+++ b/fs/xfs/xfs_rtalloc.c
@@ -1219,7 +1219,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 5ceff12393353620548280813ae24c58baae96e3..b9c65a3f354388d2a53f1dda005beefe5add2715 100644 (file)
--- a/fs/xfs/xfs_super.c
+++ b/fs/xfs/xfs_super.c
@@ -1754,12 +1754,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,