2 files changed, 4 insertions, 3 deletions

diff --git a/fs/xfs/libxfs/xfs_sb.c b/fs/xfs/libxfs/xfs_sb.c
index 0f5e08fe64a2..9c87f66ab929 100644
--- a/fs/xfs/libxfs/xfs_sb.c
+++ b/fs/xfs/libxfs/xfs_sb.c
@@ -182,9 +182,6 @@ xfs_mount_validate_sb(
         if (xfs_sb_version_hassparseinodes(sbp)) {
                 uint32_t        align;
 
-                xfs_alert(mp,
-        "EXPERIMENTAL sparse inode feature enabled. Use at your own risk!");
-
                 align = XFS_INODES_PER_CHUNK * sbp->sb_inodesize
                                 >> sbp->sb_blocklog;
                 if (sbp->sb_inoalignmt != align) {
diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c
index 1fb16562c159..f98ce83b7bc4 100644
--- a/fs/xfs/xfs_super.c
+++ b/fs/xfs/xfs_super.c
@@ -1528,6 +1528,10 @@ xfs_fs_fill_super(
                 }
         }
 
+        if (xfs_sb_version_hassparseinodes(&mp->m_sb))
+                xfs_alert(mp,
+        "EXPERIMENTAL sparse inode feature enabled. Use at your own risk!");
+
         error = xfs_mountfs(mp);
         if (error)
                 goto out_filestream_unmount;