leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xfs: teach error reporting functions to take xfs_failaddr_t

Browse Source 
Convert the two other error reporting functions to take xfs_failaddr_t
when the caller wishes to capture a code pointer instead of the classic
void * pointer.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
This commit is contained in:
Darrick J. Wong
2018-01-08 10:51:25 -08:00
parent eebf3cab9c
commit d9418ed08a
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
fs/xfs/xfs_error.c
View File

@@ -314,12 +314,12 @@ xfs_error_report(
struct xfs_mount *mp, struct xfs_mount *mp,
const char *filename, const char *filename,
int linenum, int linenum,
void *ra) xfs_failaddr_t failaddr)
{ {
if (level <= xfs_error_level) { if (level <= xfs_error_level) {
xfs_alert_tag(mp, XFS_PTAG_ERROR_REPORT, xfs_alert_tag(mp, XFS_PTAG_ERROR_REPORT,
"Internal error %s at line %d of file %s. Caller %pS", "Internal error %s at line %d of file %s. Caller %pS",
tag, linenum, filename, ra); tag, linenum, filename, failaddr);
xfs_stack_trace(); xfs_stack_trace();
} }
@@ -333,11 +333,11 @@ xfs_corruption_error(
void *p, void *p,
const char *filename, const char *filename,
int linenum, int linenum,
void *ra) xfs_failaddr_t failaddr)
{ {
if (level <= xfs_error_level) if (level <= xfs_error_level)
xfs_hex_dump(p, 64); xfs_hex_dump(p, 64);
xfs_error_report(tag, level, mp, filename, linenum, ra); xfs_error_report(tag, level, mp, filename, linenum, failaddr);
xfs_alert(mp, "Corruption detected. Unmount and run xfs_repair"); xfs_alert(mp, "Corruption detected. Unmount and run xfs_repair");
} }

5
fs/xfs/xfs_error.h
View File

@@ -21,10 +21,11 @@
struct xfs_mount; struct xfs_mount;
extern void xfs_error_report(const char *tag, int level, struct xfs_mount *mp, extern void xfs_error_report(const char *tag, int level, struct xfs_mount *mp,
const char *filename, int linenum, void *ra); const char *filename, int linenum,
xfs_failaddr_t failaddr);
extern void xfs_corruption_error(const char *tag, int level, extern void xfs_corruption_error(const char *tag, int level,
struct xfs_mount *mp, void *p, const char *filename, struct xfs_mount *mp, void *p, const char *filename,
int linenum, void *ra); int linenum, xfs_failaddr_t failaddr);
extern void xfs_verifier_error(struct xfs_buf *bp, int error, extern void xfs_verifier_error(struct xfs_buf *bp, int error,
xfs_failaddr_t failaddr); xfs_failaddr_t failaddr);