* Re: [RFC PATCH] jbd2: remove unused return value of jbd2_journal_cancel_revoke
[not found] <20200130133603.7103-1-fishland@aliyun.com>
@ 2020-02-03 9:38 ` Jan Kara
0 siblings, 0 replies; only message in thread
From: Jan Kara @ 2020-02-03 9:38 UTC (permalink / raw)
To: Liu Song; +Cc: tytso, jack, linux-ext4, linux-kernel, liu.song11
On Thu 30-01-20 21:36:03, Liu Song wrote:
> From: Liu Song <liu.song11@zte.com.cn>
>
> There is no place to use the return value of "jbd2_journal_cancel_revoke",
> so remove it.
>
> Signed-off-by: Liu Song <liu.song11@zte.com.cn>
OK, makes sense. Thanks for the cleanup. You can add:
Reviewed-by: Jan Kara <jack@suse.cz>
Honza
> ---
> fs/jbd2/revoke.c | 5 +----
> include/linux/jbd2.h | 2 +-
> 2 files changed, 2 insertions(+), 5 deletions(-)
>
> diff --git a/fs/jbd2/revoke.c b/fs/jbd2/revoke.c
> index fa608788b93d..f4fe7a171691 100644
> --- a/fs/jbd2/revoke.c
> +++ b/fs/jbd2/revoke.c
> @@ -420,12 +420,11 @@ int jbd2_journal_revoke(handle_t *handle, unsigned long long blocknr,
> * do not trust the Revoked bit on buffers unless RevokeValid is also
> * set.
> */
> -int jbd2_journal_cancel_revoke(handle_t *handle, struct journal_head *jh)
> +void jbd2_journal_cancel_revoke(handle_t *handle, struct journal_head *jh)
> {
> struct jbd2_revoke_record_s *record;
> journal_t *journal = handle->h_transaction->t_journal;
> int need_cancel;
> - int did_revoke = 0; /* akpm: debug */
> struct buffer_head *bh = jh2bh(jh);
>
> jbd_debug(4, "journal_head %p, cancelling revoke\n", jh);
> @@ -450,7 +449,6 @@ int jbd2_journal_cancel_revoke(handle_t *handle, struct journal_head *jh)
> list_del(&record->hash);
> spin_unlock(&journal->j_revoke_lock);
> kmem_cache_free(jbd2_revoke_record_cache, record);
> - did_revoke = 1;
> }
> }
>
> @@ -473,7 +471,6 @@ int jbd2_journal_cancel_revoke(handle_t *handle, struct journal_head *jh)
> __brelse(bh2);
> }
> }
> - return did_revoke;
> }
>
> /*
> diff --git a/include/linux/jbd2.h b/include/linux/jbd2.h
> index ce44b687d02b..c27716740917 100644
> --- a/include/linux/jbd2.h
> +++ b/include/linux/jbd2.h
> @@ -1470,7 +1470,7 @@ extern int __init jbd2_journal_init_revoke_table_cache(void);
>
> extern void jbd2_journal_destroy_revoke(journal_t *);
> extern int jbd2_journal_revoke (handle_t *, unsigned long long, struct buffer_head *);
> -extern int jbd2_journal_cancel_revoke(handle_t *, struct journal_head *);
> +extern void jbd2_journal_cancel_revoke(handle_t *, struct journal_head *);
> extern void jbd2_journal_write_revoke_records(transaction_t *transaction,
> struct list_head *log_bufs);
>
> --
> 2.20.1
>
--
Jan Kara <jack@suse.com>
SUSE Labs, CR
^ permalink raw reply [flat|nested] only message in thread