diff options
| author | Alex Elder <aelder@sgi.com> | 2010-05-19 09:59:23 -0500 |
|---|---|---|
| committer | Alex Elder <aelder@sgi.com> | 2010-05-19 09:59:23 -0500 |
| commit | e9cee8e6549b669080e9a7d02b8387086a5c911d (patch) | |
| tree | 292ee423003343833a9f0f6dbf7f870b977b8b1e /fs/xfs/xfs_error.h | |
| parent | 537b60d17894b7c19a6060feae40299d7109d6e7 (diff) | |
| parent | b4ed4626a9775cd8cb77209280d24839526f94f2 (diff) | |
| download | linux-e9cee8e6549b669080e9a7d02b8387086a5c911d.tar.bz2 | |
Merge branch 'master' into for-linus
Diffstat (limited to 'fs/xfs/xfs_error.h')
| -rw-r--r-- | fs/xfs/xfs_error.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/fs/xfs/xfs_error.h b/fs/xfs/xfs_error.h index 0c93051c4651..c2c1a072bb82 100644 --- a/fs/xfs/xfs_error.h +++ b/fs/xfs/xfs_error.h @@ -29,10 +29,11 @@ extern int xfs_error_trap(int); struct xfs_mount; -extern void xfs_error_report(char *tag, int level, struct xfs_mount *mp, - char *fname, int linenum, inst_t *ra); -extern void xfs_corruption_error(char *tag, int level, struct xfs_mount *mp, - void *p, char *fname, int linenum, inst_t *ra); +extern void xfs_error_report(const char *tag, int level, struct xfs_mount *mp, + const char *filename, int linenum, inst_t *ra); +extern void xfs_corruption_error(const char *tag, int level, + struct xfs_mount *mp, void *p, const char *filename, + int linenum, inst_t *ra); #define XFS_ERROR_REPORT(e, lvl, mp) \ xfs_error_report(e, lvl, mp, __FILE__, __LINE__, __return_address) |