xfs: Use consistent logging message prefixes
PATCH 1/1 xfs: Use consistent logging message prefixes
The second and subsequent lines of multi-line logging messages are not prefixed with the same information as the first line.
Separate messages with newlines into multiple calls to ensure consistent prefixing and allow easier grep use.
Signed-off-by Joe Perches <[email protected]>
--- fs/xfs/libxfs/xfs_dir2_node.c | 3 +-- fs/xfs/libxfs/xfs_sb.c | 14 +++++++----- fs/xfs/xfs_buf.c | 5 +++-- fs/xfs/xfs_log.c | 50 +++++++++++++++++++++---------------------- fs/xfs/xfs_log_recover.c | 8 ++++--- 5 files changed, 43 insertions(+), 37 deletions(-)
fs/xfs/libxfs/xfs_dir2_node.c +1 -2
@@ -1845,8 +1845,7 @@ xfs_dir2_node_addname_int(if (dp->d_ops->db_to_fdb (args->geo, dbno) != fbno) { xfs_alert(mp, - "%s: dir ino %llu needed freesp block %lld for\n" - " data block %lld, got %lld ifbno %llu lastfbno %d", +"%s: dir ino %llu needed freesp block %lld for data block %lld, got %lld ifbno %llu lastfbno %d", __func__, (unsigned long long)dp->i_ino, (long long)dp->d_ops->db_to_fdb( args->geo, dbno),
fs/xfs/libxfs/xfs_sb.c +9 -5
@@ -131,10 +131,11 @@ xfs_mount_validate_sb(if (xfs_sb_has_compat_feature (sbp,XFS_SB_FEAT_COMPAT_UNKNOWN )) {xfs_warn (mp, -"Superblock has unknown compatible features (0x%x) enabled.\n" -"Using a more recent kernel is recommended." , +"Superblock has unknown compatible features (0x%x) enabled." , (sbp->sb_features_compat &XFS_SB_FEAT_COMPAT_UNKNOWN )); +xfs_warn (mp, +"Using a more recent kernel is recommended." ); } if (xfs_sb_has_ro_compat_feature(sbp,
@@ -145,18 +146,21 @@ xfs_mount_validate_sb( XFS_SB_FEAT_RO_COMPAT_UNKNOWN));if (!(mp->m_flags &XFS_MOUNT_RDONLY )) {xfs_warn (mp, -"Attempted to mount read-only compatible filesystem read-write.\n" +"Attempted to mount read-only compatible filesystem read-write." ); +xfs_warn (mp,"Filesystem can only be safely mounted read only." ); +return -EINVAL ; } }if (xfs_sb_has_incompat_feature (sbp,XFS_SB_FEAT_INCOMPAT_UNKNOWN )) {xfs_warn (mp, -"Superblock has unknown incompatible features (0x%x) enabled.\n" -"Filesystem can not be safely mounted by this kernel." , +"Superblock has unknown incompatible features (0x%x) enabled." , (sbp->sb_features_incompat &XFS_SB_FEAT_INCOMPAT_UNKNOWN )); +xfs_warn (mp, +"Filesystem can not be safely mounted by this kernel." );return -EINVAL ; } }
fs/xfs/xfs_buf.c +3 -2
@@ -1533,9 +1533,10 @@ xfs_wait_buftarg(list_del_init (&bp->b_lru);if (bp->b_flags &XBF_WRITE_FAIL ) {xfs_alert (btp->bt_mount, -"Corruption Alert: Buffer at block 0x%llx had permanent write failures!\n" -"Please run xfs_repair to determine the extent of the problem." , +"Corruption Alert: Buffer at block 0x%llx had permanent write failures!" , (long long )bp->b_bn); +xfs_alert (btp->bt_mount, +"Please run xfs_repair to determine the extent of the problem." ); }xfs_buf_rele (bp); }
fs/xfs/xfs_log.c +25 -25
71 lines not on this page · raw message
fs/xfs/xfs_log_recover.c +5 -3
@@ -4527,11 +4527,13 @@ xlog_recover( xfs_sb_has_incompat_log_feature(&log->l_mp->m_sb, XFS_SB_FEAT_INCOMPAT_LOG_UNKNOWN)) {xfs_warn (log->l_mp, -"Superblock has unknown incompatible log features (0x%x) enabled.\n" -"The log can not be fully and/or safely recovered by this kernel.\n" -"Please recover the log on a kernel that supports the unknown features." , +"Superblock has unknown incompatible log features (0x%x) enabled." , (log->l_mp->m_sb.sb_features_log_incompat &XFS_SB_FEAT_INCOMPAT_LOG_UNKNOWN )); +xfs_warn (log->l_mp, +"The log can not be fully and/or safely recovered by this kernel." ); +xfs_warn (log->l_mp, +"Please recover the log on a kernel that supports the unknown features." );return -EINVAL ; }