Skip to content

Commit 9e6d3f9

Browse files
Kemeng Shitytso
authored andcommitted
jbd2: remove unused return value of jbd2_journal_cancel_revoke
Remove unused return value of jbd2_journal_cancel_revoke. Signed-off-by: Kemeng Shi <[email protected]> Reviewed-by: Jan Kara <[email protected]> Reviewed-by: Zhang Yi <[email protected]> Link: https://patch.msgid.link/[email protected] Signed-off-by: Theodore Ts'o <[email protected]>
1 parent ec22493 commit 9e6d3f9

File tree

2 files changed

+2
-5
lines changed

2 files changed

+2
-5
lines changed

fs/jbd2/revoke.c

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -420,12 +420,11 @@ int jbd2_journal_revoke(handle_t *handle, unsigned long long blocknr,
420420
* do not trust the Revoked bit on buffers unless RevokeValid is also
421421
* set.
422422
*/
423-
int jbd2_journal_cancel_revoke(handle_t *handle, struct journal_head *jh)
423+
void jbd2_journal_cancel_revoke(handle_t *handle, struct journal_head *jh)
424424
{
425425
struct jbd2_revoke_record_s *record;
426426
journal_t *journal = handle->h_transaction->t_journal;
427427
int need_cancel;
428-
int did_revoke = 0; /* akpm: debug */
429428
struct buffer_head *bh = jh2bh(jh);
430429

431430
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)
450449
list_del(&record->hash);
451450
spin_unlock(&journal->j_revoke_lock);
452451
kmem_cache_free(jbd2_revoke_record_cache, record);
453-
did_revoke = 1;
454452
}
455453
}
456454

@@ -473,7 +471,6 @@ int jbd2_journal_cancel_revoke(handle_t *handle, struct journal_head *jh)
473471
__brelse(bh2);
474472
}
475473
}
476-
return did_revoke;
477474
}
478475

479476
/*

include/linux/jbd2.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1621,7 +1621,7 @@ void jbd2_journal_destroy_revoke_table(struct jbd2_revoke_table_s *table);
16211621

16221622
extern void jbd2_journal_destroy_revoke(journal_t *);
16231623
extern int jbd2_journal_revoke (handle_t *, unsigned long long, struct buffer_head *);
1624-
extern int jbd2_journal_cancel_revoke(handle_t *, struct journal_head *);
1624+
extern void jbd2_journal_cancel_revoke(handle_t *, struct journal_head *);
16251625
extern void jbd2_journal_write_revoke_records(transaction_t *transaction,
16261626
struct list_head *log_bufs);
16271627

0 commit comments

Comments
 (0)