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 07/19] ext4, jbd2: Provide accessor function for handle credits
Date: Mon, 30 Sep 2019 12:43:25 +0200 [thread overview]
Message-ID: <20190930104339.24919-7-jack@suse.cz> (raw)
In-Reply-To: <20190930103544.11479-1-jack@suse.cz>
Provide accessor function to get number of credits available in a handle
and use it from ext4. Later, computation of available credits won't be
so straightforward.
Signed-off-by: Jan Kara <jack@suse.cz>
---
fs/ext4/ext4_jbd2.c | 13 +++++++------
fs/ext4/ext4_jbd2.h | 7 -------
fs/ext4/xattr.c | 2 +-
include/linux/jbd2.h | 6 ++++++
4 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/fs/ext4/ext4_jbd2.c b/fs/ext4/ext4_jbd2.c
index 2b98d893cda9..731bbfdbce5b 100644
--- a/fs/ext4/ext4_jbd2.c
+++ b/fs/ext4/ext4_jbd2.c
@@ -119,8 +119,8 @@ handle_t *__ext4_journal_start_reserved(handle_t *handle, unsigned int line,
return ext4_get_nojournal();
sb = handle->h_journal->j_private;
- trace_ext4_journal_start_reserved(sb, handle->h_buffer_credits,
- _RET_IP_);
+ trace_ext4_journal_start_reserved(sb,
+ jbd2_handle_buffer_credits(handle), _RET_IP_);
err = ext4_journal_check_start(sb);
if (err < 0) {
jbd2_journal_free_reserved(handle);
@@ -138,10 +138,10 @@ int __ext4_journal_ensure_credits(handle_t *handle, int check_cred,
{
if (!ext4_handle_valid(handle))
return 0;
- if (handle->h_buffer_credits >= check_cred)
+ if (jbd2_handle_buffer_credits(handle) >= check_cred)
return 0;
return ext4_journal_extend(handle,
- extend_cred - handle->h_buffer_credits);
+ extend_cred - jbd2_handle_buffer_credits(handle));
}
static void ext4_journal_abort_handle(const char *caller, unsigned int line,
@@ -289,7 +289,7 @@ int __ext4_handle_dirty_metadata(const char *where, unsigned int line,
handle->h_type,
handle->h_line_no,
handle->h_requested_credits,
- handle->h_buffer_credits, err);
+ jbd2_handle_buffer_credits(handle), err);
return err;
}
ext4_error_inode(inode, where, line,
@@ -300,7 +300,8 @@ int __ext4_handle_dirty_metadata(const char *where, unsigned int line,
handle->h_type,
handle->h_line_no,
handle->h_requested_credits,
- handle->h_buffer_credits, err);
+ jbd2_handle_buffer_credits(handle),
+ err);
}
} else {
if (inode)
diff --git a/fs/ext4/ext4_jbd2.h b/fs/ext4/ext4_jbd2.h
index 481bf770a374..a4b980eae4da 100644
--- a/fs/ext4/ext4_jbd2.h
+++ b/fs/ext4/ext4_jbd2.h
@@ -288,13 +288,6 @@ static inline int ext4_handle_is_aborted(handle_t *handle)
return 0;
}
-static inline int ext4_handle_has_enough_credits(handle_t *handle, int needed)
-{
- if (ext4_handle_valid(handle) && handle->h_buffer_credits < needed)
- return 0;
- return 1;
-}
-
#define ext4_journal_start_sb(sb, type, nblocks) \
__ext4_journal_start_sb((sb), __LINE__, (type), (nblocks), 0)
diff --git a/fs/ext4/xattr.c b/fs/ext4/xattr.c
index f84617302f07..17d7eea144e8 100644
--- a/fs/ext4/xattr.c
+++ b/fs/ext4/xattr.c
@@ -2314,7 +2314,7 @@ ext4_xattr_set_handle(handle_t *handle, struct inode *inode, int name_index,
flags & XATTR_CREATE);
brelse(bh);
- if (!ext4_handle_has_enough_credits(handle, credits)) {
+ if (jbd2_handle_buffer_credits(handle) < credits) {
error = -ENOSPC;
goto cleanup;
}
diff --git a/include/linux/jbd2.h b/include/linux/jbd2.h
index b20ef2c0812d..c2ad74ea6015 100644
--- a/include/linux/jbd2.h
+++ b/include/linux/jbd2.h
@@ -1647,6 +1647,12 @@ static inline tid_t jbd2_get_latest_transaction(journal_t *journal)
return tid;
}
+
+static inline int jbd2_handle_buffer_credits(handle_t *handle)
+{
+ return handle->h_buffer_credits;
+}
+
#ifdef __KERNEL__
#define buffer_trace_init(bh) do {} while (0)
--
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 ` Jan Kara [this message]
2019-09-30 10:43 ` [PATCH 08/19] ocfs2: Use accessor function for h_buffer_credits Jan Kara
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-7-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).