summaryrefslogtreecommitdiff
path: root/fs/xfs/xfs_log.c
diff options
context:
space:
mode:
authorDave Chinner <david@fromorbit.com>2016-05-20 03:33:17 +0300
committerDave Chinner <david@fromorbit.com>2016-05-20 03:33:17 +0300
commit2a4ad5894c819978dca5595396d54d51c3aca694 (patch)
tree62fcfac878219b36da9156785d832184194fd98a /fs/xfs/xfs_log.c
parenta7792aad644a259375002db8c9d9e03fd50bf509 (diff)
parent6e3e6d55e51774ec7cfc24975749bbddb28a9051 (diff)
downloadlinux-2a4ad5894c819978dca5595396d54d51c3aca694.tar.xz
Merge branch 'xfs-4.7-misc-fixes' into for-next
Diffstat (limited to 'fs/xfs/xfs_log.c')
-rw-r--r--fs/xfs/xfs_log.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/xfs/xfs_log.c b/fs/xfs/xfs_log.c
index 268f7d65cfd4..bde02f1fba73 100644
--- a/fs/xfs/xfs_log.c
+++ b/fs/xfs/xfs_log.c
@@ -3325,7 +3325,7 @@ xfs_log_force(
{
int error;
- trace_xfs_log_force(mp, 0);
+ trace_xfs_log_force(mp, 0, _RET_IP_);
error = _xfs_log_force(mp, flags, NULL);
if (error)
xfs_warn(mp, "%s: error %d returned.", __func__, error);
@@ -3474,7 +3474,7 @@ xfs_log_force_lsn(
{
int error;
- trace_xfs_log_force(mp, lsn);
+ trace_xfs_log_force(mp, lsn, _RET_IP_);
error = _xfs_log_force_lsn(mp, lsn, flags, NULL);
if (error)
xfs_warn(mp, "%s: error %d returned.", __func__, error);