jbd2: Make jbd2_handle_buffer_credits() handle reserved handles
PATCH 1/1 jbd2: Make jbd2_handle_buffer_credits() handle reserved handles
The helper jbd2_handle_buffer_credits() doesn't correctly handle reserved handles which can lead to crashes. Fix it getting of journal pointer to work for reserved handles as well.
Fixes a9a8344ee171 ("ext4, jbd2: Provide accessor function for handle credits")
Reported-by Eric Biggers <[email protected]>
Signed-off-by Jan Kara <[email protected]>
--- include/linux/jbd2.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
include/linux/jbd2.h +6 -2
@@ -1648,10 +1648,14 @@ static inline tid_t jbd2_get_latest_transaction(journal_t *journal)return tid; } -static inline int jbd2_handle_buffer_credits (handle_t *handle) { -journal_t *journal = handle->h_transaction->t_journal; +journal_t *journal; + +if (!handle->h_reserved) + journal = handle->h_transaction->t_journal; +else + journal = handle->h_journal;return handle->h_total_credits - DIV_ROUND_UP(handle->h_revoke_credits_requested,
Signature · 1 line
2.16.4
Quoted 7 lines · Jan Kara
The helper
jbd2_handle_buffer_credits()doesn't correctly handle reserved handles which can lead to crashes. Fix it getting of journal pointer to work for reserved handles as well.Fixes a9a8344ee171 ("ext4, jbd2: Provide accessor function for handle credits")Reported-by Eric Biggers <[email protected]>Signed-off-by Jan Kara <[email protected]>
Thanks, applied.
- Ted
Quoted 7 lines · Jan Kara
The helper
jbd2_handle_buffer_credits()doesn't correctly handle reserved handles which can lead to crashes. Fix it getting of journal pointer to work for reserved handles as well.Fixes a9a8344ee171 ("ext4, jbd2: Provide accessor function for handle credits")Reported-by Eric Biggers <[email protected]>Signed-off-by Jan Kara <[email protected]>
Thanks Jan,
Yes, this also fixes the problem for me with dioread_nolock on ppc64 machine.
You may add -
Tested-by Ritesh Harjani <[email protected]>
Quoted 26 lines
--- include/linux/jbd2.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)include/linux/jbd2.h +6
-2@@ -1648,10 +1648,14 @@ static inline tid_t jbd2_get_latest_transaction(journal_t *journal)return tid; } -static inline int jbd2_handle_buffer_credits (handle_t *handle) { -journal_t *journal = handle->h_transaction->t_journal; +journal_t *journal; + +if (!handle->h_reserved) + journal = handle->h_transaction->t_journal; +else + journal = handle->h_journal;return handle->h_total_credits - DIV_ROUND_UP(handle->h_revoke_credits_requested,