From: Ritesh Harjani <ritesh.list@gmail.com>
To: linux-ext4@vger.kernel.org, linux-fsdevel@vger.kernel.org
Cc: Jan Kara <jack@suse.com>,
Alexander Viro <viro@zeniv.linux.org.uk>,
Ritesh Harjani <ritesh.list@gmail.com>
Subject: [RFC 1/3] jbd2: Drop useless return value of submit_bh
Date: Mon, 20 Jun 2022 11:28:40 +0530 [thread overview]
Message-ID: <57b9cb59e50dfdf68eef82ef38944fbceba4e585.1655703467.git.ritesh.list@gmail.com> (raw)
In-Reply-To: <cover.1655703466.git.ritesh.list@gmail.com>
submit_bh always returns 0. This patch cleans up 2 of it's caller
in jbd2 to drop submit_bh's useless return value.
Once all submit_bh callers are cleaned up, we can make it's return
type as void.
Signed-off-by: Ritesh Harjani <ritesh.list@gmail.com>
---
fs/jbd2/commit.c | 11 +++++------
fs/jbd2/journal.c | 6 ++----
2 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/fs/jbd2/commit.c b/fs/jbd2/commit.c
index eb315e81f1a6..688fd960d01f 100644
--- a/fs/jbd2/commit.c
+++ b/fs/jbd2/commit.c
@@ -122,8 +122,8 @@ static int journal_submit_commit_record(journal_t *journal,
{
struct commit_header *tmp;
struct buffer_head *bh;
- int ret;
struct timespec64 now;
+ int write_flags = REQ_SYNC;
*cbh = NULL;
@@ -155,13 +155,12 @@ static int journal_submit_commit_record(journal_t *journal,
if (journal->j_flags & JBD2_BARRIER &&
!jbd2_has_feature_async_commit(journal))
- ret = submit_bh(REQ_OP_WRITE,
- REQ_SYNC | REQ_PREFLUSH | REQ_FUA, bh);
- else
- ret = submit_bh(REQ_OP_WRITE, REQ_SYNC, bh);
+ write_flags |= REQ_PREFLUSH | REQ_FUA;
+
+ submit_bh(REQ_OP_WRITE, write_flags, bh);
*cbh = bh;
- return ret;
+ return 0;
}
/*
diff --git a/fs/jbd2/journal.c b/fs/jbd2/journal.c
index c0cbeeaec2d1..81a282e676bc 100644
--- a/fs/jbd2/journal.c
+++ b/fs/jbd2/journal.c
@@ -1606,7 +1606,7 @@ static int jbd2_write_superblock(journal_t *journal, int write_flags)
{
struct buffer_head *bh = journal->j_sb_buffer;
journal_superblock_t *sb = journal->j_superblock;
- int ret;
+ int ret = 0;
/* Buffer got discarded which means block device got invalidated */
if (!buffer_mapped(bh)) {
@@ -1636,14 +1636,12 @@ static int jbd2_write_superblock(journal_t *journal, int write_flags)
sb->s_checksum = jbd2_superblock_csum(journal, sb);
get_bh(bh);
bh->b_end_io = end_buffer_write_sync;
- ret = submit_bh(REQ_OP_WRITE, write_flags, bh);
+ submit_bh(REQ_OP_WRITE, write_flags, bh);
wait_on_buffer(bh);
if (buffer_write_io_error(bh)) {
clear_buffer_write_io_error(bh);
set_buffer_uptodate(bh);
ret = -EIO;
- }
- if (ret) {
printk(KERN_ERR "JBD2: Error %d detected when updating "
"journal superblock for %s.\n", ret,
journal->j_devname);
--
2.35.3
next prev parent reply other threads:[~2022-06-20 5:59 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-20 5:58 [RFC 0/3] submit_bh: Drop unnecessary return values and API users Ritesh Harjani
2022-06-20 5:58 ` Ritesh Harjani [this message]
2022-06-20 6:39 ` [RFC 1/3] jbd2: Drop useless return value of submit_bh Christoph Hellwig
2022-06-20 9:39 ` Jan Kara
2022-06-21 1:39 ` Matthew Wilcox
2022-07-04 9:01 ` Ritesh Harjani
2022-07-18 17:55 ` Ritesh Harjani
2022-06-20 5:58 ` [RFC 2/3] fs/buffer: " Ritesh Harjani
2022-06-20 6:39 ` Christoph Hellwig
2022-06-20 9:40 ` Jan Kara
2022-06-20 5:58 ` [RFC 3/3] fs/buffer: Make submit_bh & submit_bh_wbc return type as void Ritesh Harjani
2022-06-20 6:40 ` Christoph Hellwig
2022-06-20 9:41 ` 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=57b9cb59e50dfdf68eef82ef38944fbceba4e585.1655703467.git.ritesh.list@gmail.com \
--to=ritesh.list@gmail.com \
--cc=jack@suse.com \
--cc=linux-ext4@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=viro@zeniv.linux.org.uk \
/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).