summaryrefslogtreecommitdiffstats
path: root/fs/xfs
diff options
context:
space:
mode:
authorBrian Foster <bfoster@redhat.com>2015-08-18 20:32:14 -0400
committerDave Chinner <david@fromorbit.com>2015-08-18 20:32:14 -0400
commit1b867d3ab562b6b03e46113fad3e87b05fbfbb85 (patch)
tree44f2daef4dcd407b59e9515438158064467cc4fc /fs/xfs
parent928634514bc53f66631a731bf623157c913b145e (diff)
xfs: relocate sparse inode mount warning
The sparse inodes feature is currently considered experimental. We warn at mount time from xfs_mount_validate_sb(). This function is part of the superblock verifier codepath, however, which means it could be invoked repeatedly on superblock reads or writes. This is currently only noticeable from userspace, where mkfs produces multiple warnings at format time. As mkfs warnings were not the intent of this change, relocate the mount time warning to xfs_fs_fill_super(), which is only invoked once and only in kernel space. Signed-off-by: Brian Foster <bfoster@redhat.com> Reviewed-by: Dave Chinner <dchinner@redhat.com> Signed-off-by: Dave Chinner <david@fromorbit.com>
Diffstat (limited to 'fs/xfs')
-rw-r--r--fs/xfs/libxfs/xfs_sb.c3
-rw-r--r--fs/xfs/xfs_super.c4
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(
182 if (xfs_sb_version_hassparseinodes(sbp)) { 182 if (xfs_sb_version_hassparseinodes(sbp)) {
183 uint32_t align; 183 uint32_t align;
184 184
185 xfs_alert(mp,
186 "EXPERIMENTAL sparse inode feature enabled. Use at your own risk!");
187
188 align = XFS_INODES_PER_CHUNK * sbp->sb_inodesize 185 align = XFS_INODES_PER_CHUNK * sbp->sb_inodesize
189 >> sbp->sb_blocklog; 186 >> sbp->sb_blocklog;
190 if (sbp->sb_inoalignmt != align) { 187 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(
1528 } 1528 }
1529 } 1529 }
1530 1530
1531 if (xfs_sb_version_hassparseinodes(&mp->m_sb))
1532 xfs_alert(mp,
1533 "EXPERIMENTAL sparse inode feature enabled. Use at your own risk!");
1534
1531 error = xfs_mountfs(mp); 1535 error = xfs_mountfs(mp);
1532 if (error) 1536 if (error)
1533 goto out_filestream_unmount; 1537 goto out_filestream_unmount;