diff options
| -rw-r--r-- | fs/xfs/xfs_log.c | 10 | ||||
| -rw-r--r-- | fs/xfs/xfs_mount.c | 2 | ||||
| -rw-r--r-- | fs/xfs/xfs_sb.c | 4 |
3 files changed, 6 insertions, 10 deletions
diff --git a/fs/xfs/xfs_log.c b/fs/xfs/xfs_log.c index 08624dc67317..a5f8bd9899d3 100644 --- a/fs/xfs/xfs_log.c +++ b/fs/xfs/xfs_log.c | |||
| @@ -616,11 +616,13 @@ xfs_log_mount( | |||
| 616 | int error = 0; | 616 | int error = 0; |
| 617 | int min_logfsbs; | 617 | int min_logfsbs; |
| 618 | 618 | ||
| 619 | if (!(mp->m_flags & XFS_MOUNT_NORECOVERY)) | 619 | if (!(mp->m_flags & XFS_MOUNT_NORECOVERY)) { |
| 620 | xfs_notice(mp, "Mounting Filesystem"); | 620 | xfs_notice(mp, "Mounting V%d Filesystem", |
| 621 | else { | 621 | XFS_SB_VERSION_NUM(&mp->m_sb)); |
| 622 | } else { | ||
| 622 | xfs_notice(mp, | 623 | xfs_notice(mp, |
| 623 | "Mounting filesystem in no-recovery mode. Filesystem will be inconsistent."); | 624 | "Mounting V%d filesystem in no-recovery mode. Filesystem will be inconsistent.", |
| 625 | XFS_SB_VERSION_NUM(&mp->m_sb)); | ||
| 624 | ASSERT(mp->m_flags & XFS_MOUNT_RDONLY); | 626 | ASSERT(mp->m_flags & XFS_MOUNT_RDONLY); |
| 625 | } | 627 | } |
| 626 | 628 | ||
diff --git a/fs/xfs/xfs_mount.c b/fs/xfs/xfs_mount.c index 993cb19e7d39..944f3d9456a8 100644 --- a/fs/xfs/xfs_mount.c +++ b/fs/xfs/xfs_mount.c | |||
| @@ -743,8 +743,6 @@ xfs_mountfs( | |||
| 743 | new_size *= mp->m_sb.sb_inodesize / XFS_DINODE_MIN_SIZE; | 743 | new_size *= mp->m_sb.sb_inodesize / XFS_DINODE_MIN_SIZE; |
| 744 | if (mp->m_sb.sb_inoalignmt >= XFS_B_TO_FSBT(mp, new_size)) | 744 | if (mp->m_sb.sb_inoalignmt >= XFS_B_TO_FSBT(mp, new_size)) |
| 745 | mp->m_inode_cluster_size = new_size; | 745 | mp->m_inode_cluster_size = new_size; |
| 746 | xfs_info(mp, "Using inode cluster size of %d bytes", | ||
| 747 | mp->m_inode_cluster_size); | ||
| 748 | } | 746 | } |
| 749 | 747 | ||
| 750 | /* | 748 | /* |
diff --git a/fs/xfs/xfs_sb.c b/fs/xfs/xfs_sb.c index 0c0e41bbe4e3..8baf61afae1d 100644 --- a/fs/xfs/xfs_sb.c +++ b/fs/xfs/xfs_sb.c | |||
| @@ -201,10 +201,6 @@ xfs_mount_validate_sb( | |||
| 201 | * write validation, we don't need to check feature masks. | 201 | * write validation, we don't need to check feature masks. |
| 202 | */ | 202 | */ |
| 203 | if (check_version && XFS_SB_VERSION_NUM(sbp) == XFS_SB_VERSION_5) { | 203 | if (check_version && XFS_SB_VERSION_NUM(sbp) == XFS_SB_VERSION_5) { |
| 204 | xfs_alert(mp, | ||
| 205 | "Version 5 superblock detected. This kernel has EXPERIMENTAL support enabled!\n" | ||
| 206 | "Use of these features in this kernel is at your own risk!"); | ||
| 207 | |||
| 208 | if (xfs_sb_has_compat_feature(sbp, | 204 | if (xfs_sb_has_compat_feature(sbp, |
| 209 | XFS_SB_FEAT_COMPAT_UNKNOWN)) { | 205 | XFS_SB_FEAT_COMPAT_UNKNOWN)) { |
| 210 | xfs_warn(mp, | 206 | xfs_warn(mp, |
