Thanks for the change, it looks good to me.
- Harshad
On Fri, Nov 6, 2020 at 9:12 PM Theodore Ts'o <tytso@xxxxxxx> wrote:
>
> Add missing __acquires() and __releases() annotations. Also, in an
> "this should never happen" WARN_ON check, if it *does* actually
> happen, we need to release j_state_lock since this function is always
> supposed to release that lock. Otherwise, things will quickly grind
> to a halt after the WARN_ON trips.
>
> Fixes: 96f1e0974575 ("jbd2: avoid long hold times of j_state_lock...")
> Cc: stable@xxxxxxxxxx
> Signed-off-by: Theodore Ts'o <tytso@xxxxxxx>
> ---
> fs/jbd2/checkpoint.c | 2 ++
> fs/jbd2/transaction.c | 4 +++-
> 2 files changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/fs/jbd2/checkpoint.c b/fs/jbd2/checkpoint.c
> index 263f02ad8ebf..472932b9e6bc 100644
> --- a/fs/jbd2/checkpoint.c
> +++ b/fs/jbd2/checkpoint.c
> @@ -106,6 +106,8 @@ static int __try_to_free_cp_buf(struct journal_head *jh)
> * for a checkpoint to free up some space in the log.
> */
> void __jbd2_log_wait_for_space(journal_t *journal)
> +__acquires(&journal->j_state_lock)
> +__releases(&journal->j_state_lock)
> {
> int nblocks, space_left;
> /* assert_spin_locked(&journal->j_state_lock); */
> diff --git a/fs/jbd2/transaction.c b/fs/jbd2/transaction.c
> index 43985738aa86..d54f04674e8e 100644
> --- a/fs/jbd2/transaction.c
> +++ b/fs/jbd2/transaction.c
> @@ -195,8 +195,10 @@ static void wait_transaction_switching(journal_t *journal)
> DEFINE_WAIT(wait);
>
> if (WARN_ON(!journal->j_running_transaction ||
> - journal->j_running_transaction->t_state != T_SWITCH))
> + journal->j_running_transaction->t_state != T_SWITCH)) {
> + read_unlock(&journal->j_state_lock);
> return;
> + }
> prepare_to_wait(&journal->j_wait_transaction_locked, &wait,
> TASK_UNINTERRUPTIBLE);
> read_unlock(&journal->j_state_lock);
> --
> 2.28.0
>
