jbd2: remove unused return value of jbd2_journal_cancel_revoke

Remove unused return value of jbd2_journal_cancel_revoke.

Signed-off-by: Kemeng Shi <shikemeng@huaweicloud.com>
Reviewed-by: Jan Kara <jack@suse.cz>
Reviewed-by: Zhang Yi <yi.zhang@huawei.com>
Link: https://patch.msgid.link/20250123155014.2097920-3-shikemeng@huaweicloud.com
Signed-off-by: Theodore Ts'o <tytso@mit.edu>

diff --git a/fs/jbd2/revoke.c b/fs/jbd2/revoke.c
index e157e890ff207dd677b8c0634463f61e5f56a718..3ed2e8dcd4a6027fceec4f00698f57b7fa6384b3 100644 (file)
--- 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);
 
        jbd2_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 0c4522154c0ab208cadeee4268b33627704b1483..8018d4aecf1b0192c9e5d8201268d81c8c80b1d1 100644 (file)
--- a/include/linux/jbd2.h
+++ b/include/linux/jbd2.h
@@ -1621,7 +1621,7 @@ void jbd2_journal_destroy_revoke_table(struct jbd2_revoke_table_s *table);
 
 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);