On Mon 20-06-22 11:28:40, Ritesh Harjani wrote:
> 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@xxxxxxxxx>
Looks good. Feel free to add:
Reviewed-by: Jan Kara <jack@xxxxxxx>
Honza
> ---
> 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
>
--
Jan Kara <jack@xxxxxxxx>
SUSE Labs, CR
