diff options
author | Dave Chinner <dchinner@redhat.com> | 2011-03-06 18:05:35 -0500 |
---|---|---|
committer | Dave Chinner <david@fromorbit.com> | 2011-03-06 18:05:35 -0500 |
commit | 5348778699bba92bf28b79863e09e7181d8cf95c (patch) | |
tree | 77f5349bc85bf4d35b73a9a66de304535e507bf4 /fs/xfs/xfs_mount.c | |
parent | af34e09da42801c97f39f768c715f5511d914b52 (diff) |
xfs: convert xfs_fs_cmn_err to new error logging API
Continue to clean up the error logging code by converting all the
callers of xfs_fs_cmn_err() to the new API. Once done, remove the
unused old API function.
Signed-off-by: Dave Chinner <dchinner@redhat.com>
Reviewed-by: Alex Elder <aelder@sgi.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Diffstat (limited to 'fs/xfs/xfs_mount.c')
-rw-r--r-- | fs/xfs/xfs_mount.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/fs/xfs/xfs_mount.c b/fs/xfs/xfs_mount.c index 1b43ad3d6ddb..e39b082eb049 100644 --- a/fs/xfs/xfs_mount.c +++ b/fs/xfs/xfs_mount.c | |||
@@ -881,8 +881,9 @@ xfs_update_alignment(xfs_mount_t *mp) | |||
881 | if (mp->m_flags & XFS_MOUNT_RETERR) { | 881 | if (mp->m_flags & XFS_MOUNT_RETERR) { |
882 | return XFS_ERROR(EINVAL); | 882 | return XFS_ERROR(EINVAL); |
883 | } | 883 | } |
884 | xfs_fs_cmn_err(CE_WARN, mp, | 884 | xfs_warn(mp, |
885 | "stripe alignment turned off: sunit(%d)/swidth(%d) incompatible with agsize(%d)", | 885 | "stripe alignment turned off: sunit(%d)/swidth(%d) " |
886 | "incompatible with agsize(%d)", | ||
886 | mp->m_dalign, mp->m_swidth, | 887 | mp->m_dalign, mp->m_swidth, |
887 | sbp->sb_agblocks); | 888 | sbp->sb_agblocks); |
888 | 889 | ||
@@ -892,9 +893,9 @@ xfs_update_alignment(xfs_mount_t *mp) | |||
892 | mp->m_swidth = XFS_BB_TO_FSBT(mp, mp->m_swidth); | 893 | mp->m_swidth = XFS_BB_TO_FSBT(mp, mp->m_swidth); |
893 | } else { | 894 | } else { |
894 | if (mp->m_flags & XFS_MOUNT_RETERR) { | 895 | if (mp->m_flags & XFS_MOUNT_RETERR) { |
895 | xfs_fs_cmn_err(CE_WARN, mp, | 896 | xfs_warn(mp, |
896 | "stripe alignment turned off: sunit(%d) less than bsize(%d)", | 897 | "stripe alignment turned off: sunit(%d) less than bsize(%d)", |
897 | mp->m_dalign, | 898 | mp->m_dalign, |
898 | mp->m_blockmask +1); | 899 | mp->m_blockmask +1); |
899 | return XFS_ERROR(EINVAL); | 900 | return XFS_ERROR(EINVAL); |
900 | } | 901 | } |
@@ -1100,7 +1101,7 @@ xfs_mount_reset_sbqflags( | |||
1100 | return 0; | 1101 | return 0; |
1101 | 1102 | ||
1102 | #ifdef QUOTADEBUG | 1103 | #ifdef QUOTADEBUG |
1103 | xfs_fs_cmn_err(CE_NOTE, mp, "Writing superblock quota changes"); | 1104 | xfs_notice(mp, "Writing superblock quota changes"); |
1104 | #endif | 1105 | #endif |
1105 | 1106 | ||
1106 | tp = xfs_trans_alloc(mp, XFS_TRANS_QM_SBCHANGE); | 1107 | tp = xfs_trans_alloc(mp, XFS_TRANS_QM_SBCHANGE); |
@@ -1108,8 +1109,7 @@ xfs_mount_reset_sbqflags( | |||
1108 | XFS_DEFAULT_LOG_COUNT); | 1109 | XFS_DEFAULT_LOG_COUNT); |
1109 | if (error) { | 1110 | if (error) { |
1110 | xfs_trans_cancel(tp, 0); | 1111 | xfs_trans_cancel(tp, 0); |
1111 | xfs_fs_cmn_err(CE_ALERT, mp, | 1112 | xfs_alert(mp, "%s: Superblock update failed!", __func__); |
1112 | "xfs_mount_reset_sbqflags: Superblock update failed!"); | ||
1113 | return error; | 1113 | return error; |
1114 | } | 1114 | } |
1115 | 1115 | ||