diff options
| author | Dave Chinner <david@fromorbit.com> | 2015-06-22 18:49:01 -0400 |
|---|---|---|
| committer | Dave Chinner <david@fromorbit.com> | 2015-06-22 18:49:01 -0400 |
| commit | de50e16ffabf64d30ca9372f39dc855a7553e305 (patch) | |
| tree | 08b926c00c75fde21823ee8279ce1473546d1356 /fs/xfs/xfs_error.h | |
| parent | 3d238b7e0efc2d9dde7513298ef32da289a6a0f4 (diff) | |
| parent | f66bf042693b620133d39af8d2f13615f03eadfc (diff) | |
Merge branch 'xfs-misc-fixes-for-4.2-3' into for-next
Diffstat (limited to 'fs/xfs/xfs_error.h')
| -rw-r--r-- | fs/xfs/xfs_error.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/xfs/xfs_error.h b/fs/xfs/xfs_error.h index c0394ed126fc..4ed3042a0f16 100644 --- a/fs/xfs/xfs_error.h +++ b/fs/xfs/xfs_error.h | |||
| @@ -21,10 +21,10 @@ | |||
| 21 | struct xfs_mount; | 21 | struct xfs_mount; |
| 22 | 22 | ||
| 23 | extern void xfs_error_report(const char *tag, int level, struct xfs_mount *mp, | 23 | extern void xfs_error_report(const char *tag, int level, struct xfs_mount *mp, |
| 24 | const char *filename, int linenum, inst_t *ra); | 24 | const char *filename, int linenum, void *ra); |
| 25 | extern void xfs_corruption_error(const char *tag, int level, | 25 | extern void xfs_corruption_error(const char *tag, int level, |
| 26 | struct xfs_mount *mp, void *p, const char *filename, | 26 | struct xfs_mount *mp, void *p, const char *filename, |
| 27 | int linenum, inst_t *ra); | 27 | int linenum, void *ra); |
| 28 | extern void xfs_verifier_error(struct xfs_buf *bp); | 28 | extern void xfs_verifier_error(struct xfs_buf *bp); |
| 29 | 29 | ||
| 30 | #define XFS_ERROR_REPORT(e, lvl, mp) \ | 30 | #define XFS_ERROR_REPORT(e, lvl, mp) \ |