X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=fs%2Fxfs%2Fxfs_rtalloc.c;h=b8c79ee791afc7415f9b61214d9a447a16bd63f2;hb=2d7b4cdbb523cd11a978519f8e11895c27f05258;hp=699066fb9052d315f5670c93ff39bb3c7b7a234f;hpb=d5f78f50fff3c69915bde28be901b8da56da7e06;p=linux-2.6-block.git

diff --git a/fs/xfs/xfs_rtalloc.c b/fs/xfs/xfs_rtalloc.c
index 699066fb9052..b8c79ee791af 100644
--- a/fs/xfs/xfs_rtalloc.c
+++ b/fs/xfs/xfs_rtalloc.c
@@ -951,8 +951,7 @@ xfs_growfs_rt(
 		return -EINVAL;
 
 	/* Unsupported realtime features. */
-	if (xfs_sb_version_hasrmapbt(&mp->m_sb) ||
-	    xfs_sb_version_hasreflink(&mp->m_sb))
+	if (xfs_has_rmapbt(mp) || xfs_has_reflink(mp))
 		return -EOPNOTSUPP;
 
 	nrblocks = in->newblocks;
@@ -1131,6 +1130,9 @@ error_cancel:
 		error = xfs_trans_commit(tp);
 		if (error)
 			break;
+
+		/* Ensure the mount RT feature flag is now set. */
+		mp->m_features |= XFS_FEAT_REALTIME;
 	}
 	if (error)
 		goto out_free;