diff options
| author | Dave Chinner <david@fromorbit.com> | 2015-03-25 00:12:30 -0400 |
|---|---|---|
| committer | Dave Chinner <david@fromorbit.com> | 2015-03-25 00:12:30 -0400 |
| commit | 2b93681f593577df6fcb9af61947beaace071b74 (patch) | |
| tree | 1d4826b38a06d3da93de1aaf9f66dda2cd99911d /fs/xfs/xfs_error.c | |
| parent | d41bb03444147305e955cdd53753f0493e4d9e28 (diff) | |
| parent | 5e9383f97e773e9a5385144ef5561f2ac0ee1349 (diff) | |
Merge branch 'xfs-misc-fixes-for-4.1-2' into for-next
Conflicts:
fs/xfs/libxfs/xfs_bmap.c
fs/xfs/xfs_inode.c
Diffstat (limited to 'fs/xfs/xfs_error.c')
| -rw-r--r-- | fs/xfs/xfs_error.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/xfs/xfs_error.c b/fs/xfs/xfs_error.c index 3ee186ac1093..338e50bbfd1e 100644 --- a/fs/xfs/xfs_error.c +++ b/fs/xfs/xfs_error.c | |||
| @@ -131,7 +131,7 @@ xfs_error_report( | |||
| 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, |
| 134 | "Internal error %s at line %d of file %s. Caller %pF", | 134 | "Internal error %s at line %d of file %s. Caller %pS", |
| 135 | tag, linenum, filename, ra); | 135 | tag, linenum, filename, ra); |
| 136 | 136 | ||
| 137 | xfs_stack_trace(); | 137 | xfs_stack_trace(); |