diff options
| author | Theodore Ts'o <tytso@mit.edu> | 2019-11-05 16:02:20 -0500 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2019-11-05 16:02:20 -0500 |
| commit | a6d4040846bff49c7e870cee5693245f87f2cfce (patch) | |
| tree | 215862ebc82e00599e7cb2fa8ae7b88356768c1b /fs/ocfs2/journal.c | |
| parent | 0d0a60c92fedbd4bf484c4c9b5cd49c16d05fb3f (diff) | |
| parent | 19014d697147c6aea3a34eea00a2844e698d070f (diff) | |
| download | lwn-a6d4040846bff49c7e870cee5693245f87f2cfce.tar.gz lwn-a6d4040846bff49c7e870cee5693245f87f2cfce.zip | |
Merge branch 'jk/jbd2-revoke-overflow'
Diffstat (limited to 'fs/ocfs2/journal.c')
| -rw-r--r-- | fs/ocfs2/journal.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/ocfs2/journal.c b/fs/ocfs2/journal.c index 930e3d388579..a032f0297dad 100644 --- a/fs/ocfs2/journal.c +++ b/fs/ocfs2/journal.c @@ -419,14 +419,14 @@ int ocfs2_extend_trans(handle_t *handle, int nblocks) if (!nblocks) return 0; - old_nblocks = handle->h_buffer_credits; + old_nblocks = jbd2_handle_buffer_credits(handle); trace_ocfs2_extend_trans(old_nblocks, nblocks); #ifdef CONFIG_OCFS2_DEBUG_FS status = 1; #else - status = jbd2_journal_extend(handle, nblocks); + status = jbd2_journal_extend(handle, nblocks, 0); if (status < 0) { mlog_errno(status); goto bail; @@ -460,13 +460,13 @@ int ocfs2_allocate_extend_trans(handle_t *handle, int thresh) BUG_ON(!handle); - old_nblks = handle->h_buffer_credits; + old_nblks = jbd2_handle_buffer_credits(handle); trace_ocfs2_allocate_extend_trans(old_nblks, thresh); if (old_nblks < thresh) return 0; - status = jbd2_journal_extend(handle, OCFS2_MAX_TRANS_DATA); + status = jbd2_journal_extend(handle, OCFS2_MAX_TRANS_DATA, 0); if (status < 0) { mlog_errno(status); goto bail; |