UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Jia-Ju Bai 2019-09-25 16:46:55 -07:00 committed by Linus Torvalds
parent dbbf869da3
commit d256085be1
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
fs/reiserfs/journal.c
View File

@ -3444,9 +3444,8 @@ static int remove_from_transaction(struct super_block *sb,
if (cn == journal->j_last) { if (cn == journal->j_last) {
journal->j_last = cn->prev; journal->j_last = cn->prev;
} }
if (bh) remove_journal_hash(sb, journal->j_hash_table, NULL,
remove_journal_hash(sb, journal->j_hash_table, NULL, bh->b_blocknr, 0);
bh->b_blocknr, 0);
clear_buffer_journaled(bh); /* don't log this one */ clear_buffer_journaled(bh); /* don't log this one */
if (!already_cleaned) { if (!already_cleaned) {