From: Jan Kara <jack@suse.cz>
To: <linux-ext4@vger.kernel.org>
Cc: Ted Tso <tytso@mit.edu>, Jan Kara <jack@suse.cz>
Subject: [PATCH 08/19] ocfs2: Use accessor function for h_buffer_credits
Date: Mon, 30 Sep 2019 12:43:26 +0200 [thread overview]
Message-ID: <20190930104339.24919-8-jack@suse.cz> (raw)
In-Reply-To: <20190930103544.11479-1-jack@suse.cz>
Use the jbd2 accessor function for h_buffer_credits.
Signed-off-by: Jan Kara <jack@suse.cz>
---
fs/ocfs2/alloc.c | 32 ++++++++++++++++----------------
fs/ocfs2/journal.c | 4 ++--
2 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/fs/ocfs2/alloc.c b/fs/ocfs2/alloc.c
index 0c335b51043d..913bf24f406f 100644
--- a/fs/ocfs2/alloc.c
+++ b/fs/ocfs2/alloc.c
@@ -2288,9 +2288,9 @@ static int ocfs2_extend_rotate_transaction(handle_t *handle, int subtree_depth,
int ret = 0;
int credits = (path->p_tree_depth - subtree_depth) * 2 + 1 + op_credits;
- if (handle->h_buffer_credits < credits)
+ if (jbd2_handle_buffer_credits(handle) < credits)
ret = ocfs2_extend_trans(handle,
- credits - handle->h_buffer_credits);
+ credits - jbd2_handle_buffer_credits(handle));
return ret;
}
@@ -2367,7 +2367,7 @@ static int ocfs2_rotate_tree_right(handle_t *handle,
struct ocfs2_path *right_path,
struct ocfs2_path **ret_left_path)
{
- int ret, start, orig_credits = handle->h_buffer_credits;
+ int ret, start, orig_credits = jbd2_handle_buffer_credits(handle);
u32 cpos;
struct ocfs2_path *left_path = NULL;
struct super_block *sb = ocfs2_metadata_cache_get_super(et->et_ci);
@@ -3148,7 +3148,7 @@ static int ocfs2_rotate_tree_left(handle_t *handle,
struct ocfs2_path *path,
struct ocfs2_cached_dealloc_ctxt *dealloc)
{
- int ret, orig_credits = handle->h_buffer_credits;
+ int ret, orig_credits = jbd2_handle_buffer_credits(handle);
struct ocfs2_path *tmp_path = NULL, *restart_path = NULL;
struct ocfs2_extent_block *eb;
struct ocfs2_extent_list *el;
@@ -3386,8 +3386,8 @@ static int ocfs2_merge_rec_right(struct ocfs2_path *left_path,
right_path);
ret = ocfs2_extend_rotate_transaction(handle, subtree_index,
- handle->h_buffer_credits,
- right_path);
+ jbd2_handle_buffer_credits(handle),
+ right_path);
if (ret) {
mlog_errno(ret);
goto out;
@@ -3548,8 +3548,8 @@ static int ocfs2_merge_rec_left(struct ocfs2_path *right_path,
right_path);
ret = ocfs2_extend_rotate_transaction(handle, subtree_index,
- handle->h_buffer_credits,
- left_path);
+ jbd2_handle_buffer_credits(handle),
+ left_path);
if (ret) {
mlog_errno(ret);
goto out;
@@ -3623,7 +3623,7 @@ static int ocfs2_merge_rec_left(struct ocfs2_path *right_path,
le16_to_cpu(el->l_next_free_rec) == 1) {
/* extend credit for ocfs2_remove_rightmost_path */
ret = ocfs2_extend_rotate_transaction(handle, 0,
- handle->h_buffer_credits,
+ jbd2_handle_buffer_credits(handle),
right_path);
if (ret) {
mlog_errno(ret);
@@ -3669,7 +3669,7 @@ static int ocfs2_try_to_merge_extent(handle_t *handle,
if (ctxt->c_split_covers_rec && ctxt->c_has_empty_extent) {
/* extend credit for ocfs2_remove_rightmost_path */
ret = ocfs2_extend_rotate_transaction(handle, 0,
- handle->h_buffer_credits,
+ jbd2_handle_buffer_credits(handle),
path);
if (ret) {
mlog_errno(ret);
@@ -3725,7 +3725,7 @@ static int ocfs2_try_to_merge_extent(handle_t *handle,
/* extend credit for ocfs2_remove_rightmost_path */
ret = ocfs2_extend_rotate_transaction(handle, 0,
- handle->h_buffer_credits,
+ jbd2_handle_buffer_credits(handle),
path);
if (ret) {
mlog_errno(ret);
@@ -3755,7 +3755,7 @@ static int ocfs2_try_to_merge_extent(handle_t *handle,
/* extend credit for ocfs2_remove_rightmost_path */
ret = ocfs2_extend_rotate_transaction(handle, 0,
- handle->h_buffer_credits,
+ jbd2_handle_buffer_credits(handle),
path);
if (ret) {
mlog_errno(ret);
@@ -3799,7 +3799,7 @@ static int ocfs2_try_to_merge_extent(handle_t *handle,
if (ctxt->c_split_covers_rec) {
/* extend credit for ocfs2_remove_rightmost_path */
ret = ocfs2_extend_rotate_transaction(handle, 0,
- handle->h_buffer_credits,
+ jbd2_handle_buffer_credits(handle),
path);
if (ret) {
mlog_errno(ret);
@@ -5358,7 +5358,7 @@ static int ocfs2_truncate_rec(handle_t *handle,
if (ocfs2_is_empty_extent(&el->l_recs[0]) && index > 0) {
/* extend credit for ocfs2_remove_rightmost_path */
ret = ocfs2_extend_rotate_transaction(handle, 0,
- handle->h_buffer_credits,
+ jbd2_handle_buffer_credits(handle),
path);
if (ret) {
mlog_errno(ret);
@@ -5427,8 +5427,8 @@ static int ocfs2_truncate_rec(handle_t *handle,
}
ret = ocfs2_extend_rotate_transaction(handle, 0,
- handle->h_buffer_credits,
- path);
+ jbd2_handle_buffer_credits(handle),
+ path);
if (ret) {
mlog_errno(ret);
goto out;
diff --git a/fs/ocfs2/journal.c b/fs/ocfs2/journal.c
index 930e3d388579..019aaf2a3f8a 100644
--- a/fs/ocfs2/journal.c
+++ b/fs/ocfs2/journal.c
@@ -419,7 +419,7 @@ 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);
@@ -460,7 +460,7 @@ 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)
--
2.16.4
next prev parent reply other threads:[~2019-09-30 10:43 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-30 10:43 [PATCH 0/19 v2] ext4: Fix transaction overflow due to revoke descriptors Jan Kara
2019-09-30 10:43 ` [PATCH 01/19] jbd2: Fix possible overflow in jbd2_log_space_left() Jan Kara
2019-09-30 10:43 ` [PATCH 02/19] jbd2: Fixup stale comment in commit code Jan Kara
2019-09-30 10:43 ` [PATCH 03/19] ext4: Do not iput inode under running transaction in ext4_mkdir() Jan Kara
2019-09-30 10:43 ` [PATCH 04/19] ext4: Use ext4_journal_extend() instead of jbd2_journal_extend() Jan Kara
2019-09-30 10:43 ` [PATCH 05/19] ext4: Avoid unnecessary revokes in ext4_alloc_branch() Jan Kara
2019-09-30 10:43 ` [PATCH 06/19] ext4: Provide function to handle transaction restarts Jan Kara
2019-09-30 10:43 ` [PATCH 07/19] ext4, jbd2: Provide accessor function for handle credits Jan Kara
2019-09-30 10:43 ` Jan Kara [this message]
2019-09-30 10:43 ` [PATCH 09/19] jbd2: Fix statistics for the number of logged blocks Jan Kara
2019-09-30 10:43 ` [PATCH 10/19] jbd2: Reorganize jbd2_journal_stop() Jan Kara
2019-09-30 10:43 ` [PATCH 11/19] jbd2: Drop pointless check from jbd2_journal_stop() Jan Kara
2019-09-30 10:43 ` [PATCH 12/19] jbd2: Drop pointless wakeup " Jan Kara
2019-09-30 10:43 ` [PATCH 13/19] jbd2: Factor out common parts of stopping and restarting a handle Jan Kara
2019-09-30 10:43 ` [PATCH 14/19] jbd2: Account descriptor blocks into t_outstanding_credits Jan Kara
2019-09-30 10:43 ` [PATCH 15/19] jbd2: Drop jbd2_space_needed() Jan Kara
2019-09-30 10:43 ` [PATCH 16/19] jbd2: Reserve space for revoke descriptor blocks Jan Kara
2019-09-30 12:24 ` kbuild test robot
2019-09-30 10:43 ` [PATCH 17/19] jbd2: Rename h_buffer_credits to h_total_credits Jan Kara
2019-09-30 11:27 ` kbuild test robot
2019-09-30 12:26 ` kbuild test robot
2019-09-30 15:05 ` Theodore Y. Ts'o
2019-09-30 16:25 ` Jan Kara
2019-09-30 21:21 ` Theodore Y. Ts'o
2019-10-01 7:59 ` Jan Kara
2019-10-03 8:33 ` Jan Kara
2019-10-03 13:29 ` Theodore Y. Ts'o
2019-10-03 21:50 ` Jan Kara
2019-09-30 10:43 ` [PATCH 18/19] jbd2: Make credit checking more strict Jan Kara
2019-09-30 10:43 ` [PATCH 19/19] ext4: Reserve revoke credits for freed blocks Jan Kara
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190930104339.24919-8-jack@suse.cz \
--to=jack@suse.cz \
--cc=linux-ext4@vger.kernel.org \
--cc=tytso@mit.edu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).