summaryrefslogtreecommitdiffstats
path: root/fs/xfs/xfs_log.c
diff options
context:
space:
mode:
authorDave Chinner <david@fromorbit.com>2016-07-20 11:53:35 +1000
committerDave Chinner <david@fromorbit.com>2016-07-20 11:53:35 +1000
commitbbfeb6141fcc8e2aea47b2f235cc8cc8ffb4a293 (patch)
tree65fc831b4e915412ac4baf0fd72525eb05d48aa8 /fs/xfs/xfs_log.c
parentf63716175c0730c2f29b4591146f0045cfcaa8dc (diff)
parent9c7504aa72b6e2104ba6dcef518c15672ec51175 (diff)
downloadop-kernel-dev-bbfeb6141fcc8e2aea47b2f235cc8cc8ffb4a293.zip
op-kernel-dev-bbfeb6141fcc8e2aea47b2f235cc8cc8ffb4a293.tar.gz
Merge branch 'xfs-4.8-buf-fixes' into for-next
Diffstat (limited to 'fs/xfs/xfs_log.c')
-rw-r--r--fs/xfs/xfs_log.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/fs/xfs/xfs_log.c b/fs/xfs/xfs_log.c
index 63dad9e..3b74fa0 100644
--- a/fs/xfs/xfs_log.c
+++ b/fs/xfs/xfs_log.c
@@ -1415,7 +1415,7 @@ xlog_alloc_log(
*/
error = -ENOMEM;
bp = xfs_buf_alloc(mp->m_logdev_targp, XFS_BUF_DADDR_NULL,
- BTOBB(log->l_iclog_size), 0);
+ BTOBB(log->l_iclog_size), XBF_NO_IOACCT);
if (!bp)
goto out_free_log;
@@ -1454,7 +1454,8 @@ xlog_alloc_log(
prev_iclog = iclog;
bp = xfs_buf_get_uncached(mp->m_logdev_targp,
- BTOBB(log->l_iclog_size), 0);
+ BTOBB(log->l_iclog_size),
+ XBF_NO_IOACCT);
if (!bp)
goto out_free_iclog;
OpenPOWER on IntegriCloud