2024-05-06 14:19:17

by Kemeng Shi

Subject: [PATCH 6/9] jbd2: use bh_in instead of jh2bh(jh_in) to simplify code

We save jh2bh(jh_in) to bh_in, so use bh_in directly instead of
jh2bh(jh_in) to simplify the code.

Signed-off-by: Kemeng Shi <[email protected]>
---
fs/jbd2/journal.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fs/jbd2/journal.c b/fs/jbd2/journal.c
index 87f558bd2e8a..01e33b643e4d 100644
--- a/fs/jbd2/journal.c
+++ b/fs/jbd2/journal.c
@@ -363,8 +363,8 @@ int jbd2_journal_write_metadata_buffer(transaction_t *transaction,
new_folio = virt_to_folio(jh_in->b_frozen_data);
new_offset = offset_in_folio(new_folio, jh_in->b_frozen_data);
} else {
- new_folio = jh2bh(jh_in)->b_folio;
- new_offset = offset_in_folio(new_folio, jh2bh(jh_in)->b_data);
+ new_folio = bh_in->b_folio;
+ new_offset = offset_in_folio(new_folio, bh_in->b_data);
}

mapped_data = kmap_local_folio(new_folio, new_offset);
--
2.30.0

2024-05-07 13:15:42

by Zhang Yi

Subject: Re: [PATCH 6/9] jbd2: use bh_in instead of jh2bh(jh_in) to simplify code

On 2024/5/6 22:17, Kemeng Shi wrote:
> We save jh2bh(jh_in) to bh_in, so use bh_in directly instead of
> jh2bh(jh_in) to simplify the code.
>
> Signed-off-by: Kemeng Shi <[email protected]>

Looks good to me.

Reviewed-by: Zhang Yi <[email protected]>

> ---
> fs/jbd2/journal.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/fs/jbd2/journal.c b/fs/jbd2/journal.c
> index 87f558bd2e8a..01e33b643e4d 100644
> --- a/fs/jbd2/journal.c
> +++ b/fs/jbd2/journal.c
> @@ -363,8 +363,8 @@ int jbd2_journal_write_metadata_buffer(transaction_t *transaction,
> new_folio = virt_to_folio(jh_in->b_frozen_data);
> new_offset = offset_in_folio(new_folio, jh_in->b_frozen_data);
> } else {
> - new_folio = jh2bh(jh_in)->b_folio;
> - new_offset = offset_in_folio(new_folio, jh2bh(jh_in)->b_data);
> + new_folio = bh_in->b_folio;
> + new_offset = offset_in_folio(new_folio, bh_in->b_data);
> }
>
> mapped_data = kmap_local_folio(new_folio, new_offset);
>

2024-05-13 13:43:37

by Jan Kara

Subject: Re: [PATCH 6/9] jbd2: use bh_in instead of jh2bh(jh_in) to simplify code

On Mon 06-05-24 22:17:58, Kemeng Shi wrote:
> We save jh2bh(jh_in) to bh_in, so use bh_in directly instead of
> jh2bh(jh_in) to simplify the code.
>
> Signed-off-by: Kemeng Shi <[email protected]>

Looks good. Feel free to add:

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

Honza

> ---
> fs/jbd2/journal.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/fs/jbd2/journal.c b/fs/jbd2/journal.c
> index 87f558bd2e8a..01e33b643e4d 100644
> --- a/fs/jbd2/journal.c
> +++ b/fs/jbd2/journal.c
> @@ -363,8 +363,8 @@ int jbd2_journal_write_metadata_buffer(transaction_t *transaction,
> new_folio = virt_to_folio(jh_in->b_frozen_data);
> new_offset = offset_in_folio(new_folio, jh_in->b_frozen_data);
> } else {
> - new_folio = jh2bh(jh_in)->b_folio;
> - new_offset = offset_in_folio(new_folio, jh2bh(jh_in)->b_data);
> + new_folio = bh_in->b_folio;
> + new_offset = offset_in_folio(new_folio, bh_in->b_data);
> }
>
> mapped_data = kmap_local_folio(new_folio, new_offset);
> --
> 2.30.0
>
--
Jan Kara <[email protected]>
SUSE Labs, CR