diff options
| author | Dave Chinner <david@fromorbit.com> | 2022-04-21 08:45:52 +0200 |
|---|---|---|
| committer | Dave Chinner <david@fromorbit.com> | 2022-04-21 08:45:52 +0200 |
| commit | 463260d7670566c357dfa2c38bc3124c98b646bc (patch) | |
| tree | 7d43a6c0d54fa5e0d64545c8332136640d4d0f36 /fs/xfs/xfs_trans.c | |
| parent | Merge branch 'guilt/xfs-unsigned-flags-5.18' into xfs-5.19-for-next (diff) | |
| parent | xfs: CIL context doesn't need to count iovecs (diff) | |
| download | linux-463260d7670566c357dfa2c38bc3124c98b646bc.tar.xz 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.c | 6 |
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) |