Commit d256085b authored Sep 25, 2019 by Jia-Ju Bai Committed by Linus Torvalds Sep 25, 2019

fs: reiserfs: remove unnecessary check of bh in remove_from_transaction()

On lines 3430-3434, bh has been assured to be non-null:
    cn = get_journal_hash_dev(sb, journal->j_hash_table, blocknr);
    if (!cn || !cn->bh) {
        return ret;
    }
    bh = cn->bh;

Thus, the check of bh on line 3447 is unnecessary and can be removed.
Thank Andrew Morton for good advice.

Link: http://lkml.kernel.org/r/20190727084019.11307-1-baijiaju1990@gmail.com


Signed-off-by: Jia-Ju Bai <baijiaju1990@gmail.com>
Reviewed-by: Jan Kara <jack@suse.cz>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Hariprasad Kelam <hariprasad.kelam@gmail.com>
Cc: Bharath Vedartham <linux.bhar@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent dbbf869d

fs/reiserfs/journal.c

+2 −3

Original line number	Diff line number	Diff line
		@@ -3444,7 +3444,6 @@ static int remove_from_transaction(struct super_block *sb,
		if (cn == journal->j_last) {
		journal->j_last = cn->prev;
		}
		if (bh)
		remove_journal_hash(sb, journal->j_hash_table, NULL,
		bh->b_blocknr, 0);
		clear_buffer_journaled(bh); /* don't log this one */

Admin message