aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/fs/xfs/xfs_trans.c
diff options
context:
space:
mode:
authorDave Chinner <david@fromorbit.com>2022-04-21 16:45:52 +1000
committerDave Chinner <david@fromorbit.com>2022-04-21 16:45:52 +1000
commit463260d7670566c357dfa2c38bc3124c98b646bc (patch)
tree7d43a6c0d54fa5e0d64545c8332136640d4d0f36 /fs/xfs/xfs_trans.c
parentMerge branch 'guilt/xfs-unsigned-flags-5.18' into xfs-5.19-for-next (diff)
parentxfs: CIL context doesn't need to count iovecs (diff)
downloadwireguard-linux-463260d7670566c357dfa2c38bc3124c98b646bc.tar.xz
wireguard-linux-463260d7670566c357dfa2c38bc3124c98b646bc.zip
Merge branch 'guilt/xlog-write-rework' into xfs-5.19-for-next
Diffstat (limited to 'fs/xfs/xfs_trans.c')
-rw-r--r--fs/xfs/xfs_trans.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/fs/xfs/xfs_trans.c b/fs/xfs/xfs_trans.c
index 6d9df2e9b267..836ce2beac53 100644
--- a/fs/xfs/xfs_trans.c
+++ b/fs/xfs/xfs_trans.c
@@ -194,11 +194,9 @@ xfs_trans_reserve(
ASSERT(resp->tr_logflags & XFS_TRANS_PERM_LOG_RES);
error = xfs_log_regrant(mp, tp->t_ticket);
} else {
- error = xfs_log_reserve(mp,
- resp->tr_logres,
+ error = xfs_log_reserve(mp, resp->tr_logres,
resp->tr_logcount,
- &tp->t_ticket, XFS_TRANSACTION,
- permanent);
+ &tp->t_ticket, permanent);
}
if (error)