2019-07-27 08:42:54

by Jia-Ju Bai

Subject: [PATCH] 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.

Signed-off-by: Jia-Ju Bai <[email protected]>
---
fs/reiserfs/journal.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/fs/reiserfs/journal.c b/fs/reiserfs/journal.c
index 4517a1394c6f..11155b8513db 100644
--- a/fs/reiserfs/journal.c
+++ b/fs/reiserfs/journal.c
@@ -3444,9 +3444,8 @@ 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);
+ remove_journal_hash(sb, journal->j_hash_table, NULL,
+ bh->b_blocknr, 0);
clear_buffer_journaled(bh); /* don't log this one */

if (!already_cleaned) {
--
2.17.0

2019-07-31 12:14:40

by Jan Kara

Subject: Re: [PATCH] fs: reiserfs: Remove unnecessary check of bh in remove_from_transaction()

On Sat 27-07-19 16:40:19, Jia-Ju Bai wrote:
> 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.
>
> Signed-off-by: Jia-Ju Bai <[email protected]>

Looks good to me. You can add:

Reviewed-by: Jan Kara <[email protected]>

Honza

> ---
> fs/reiserfs/journal.c | 5 ++---
> 1 file changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/fs/reiserfs/journal.c b/fs/reiserfs/journal.c
> index 4517a1394c6f..11155b8513db 100644
> --- a/fs/reiserfs/journal.c
> +++ b/fs/reiserfs/journal.c
> @@ -3444,9 +3444,8 @@ 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);
> + remove_journal_hash(sb, journal->j_hash_table, NULL,
> + bh->b_blocknr, 0);
> clear_buffer_journaled(bh); /* don't log this one */
>
> if (!already_cleaned) {
> --
> 2.17.0
>
--
Jan Kara <[email protected]>
SUSE Labs, CR