aboutsummaryrefslogtreecommitdiffstats
path: root/fs/xfs/xfs_error.c
diff options
context:
space:
mode:
authorDave Chinner <david@fromorbit.com>2015-06-22 18:49:01 -0400
committerDave Chinner <david@fromorbit.com>2015-06-22 18:49:01 -0400
commitde50e16ffabf64d30ca9372f39dc855a7553e305 (patch)
tree08b926c00c75fde21823ee8279ce1473546d1356 /fs/xfs/xfs_error.c
parent3d238b7e0efc2d9dde7513298ef32da289a6a0f4 (diff)
parentf66bf042693b620133d39af8d2f13615f03eadfc (diff)
Merge branch 'xfs-misc-fixes-for-4.2-3' into for-next
Diffstat (limited to 'fs/xfs/xfs_error.c')
-rw-r--r--fs/xfs/xfs_error.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/xfs/xfs_error.c b/fs/xfs/xfs_error.c
index 338e50bbfd1e..74d0e5966ebc 100644
--- a/fs/xfs/xfs_error.c
+++ b/fs/xfs/xfs_error.c
@@ -127,7 +127,7 @@ xfs_error_report(
127 struct xfs_mount *mp, 127 struct xfs_mount *mp,
128 const char *filename, 128 const char *filename,
129 int linenum, 129 int linenum,
130 inst_t *ra) 130 void *ra)
131{ 131{
132 if (level <= xfs_error_level) { 132 if (level <= xfs_error_level) {
133 xfs_alert_tag(mp, XFS_PTAG_ERROR_REPORT, 133 xfs_alert_tag(mp, XFS_PTAG_ERROR_REPORT,
@@ -146,7 +146,7 @@ xfs_corruption_error(
146 void *p, 146 void *p,
147 const char *filename, 147 const char *filename,
148 int linenum, 148 int linenum,
149 inst_t *ra) 149 void *ra)
150{ 150{
151 if (level <= xfs_error_level) 151 if (level <= xfs_error_level)
152 xfs_hex_dump(p, 64); 152 xfs_hex_dump(p, 64);