jbd2: fix up sparse warnings in checkpoint code
commit5.4-rM2-2.2.x-imx-squashed05d5233df8
upstream. 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:96f1e09745
("jbd2: avoid long hold times of j_state_lock...") Cc: stable@kernel.org Signed-off-by: Theodore Ts'o <tytso@mit.edu> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
parent
2192d905df
commit
84778a43ae
|
@ -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.
|
* for a checkpoint to free up some space in the log.
|
||||||
*/
|
*/
|
||||||
void __jbd2_log_wait_for_space(journal_t *journal)
|
void __jbd2_log_wait_for_space(journal_t *journal)
|
||||||
|
__acquires(&journal->j_state_lock)
|
||||||
|
__releases(&journal->j_state_lock)
|
||||||
{
|
{
|
||||||
int nblocks, space_left;
|
int nblocks, space_left;
|
||||||
/* assert_spin_locked(&journal->j_state_lock); */
|
/* assert_spin_locked(&journal->j_state_lock); */
|
||||||
|
|
|
@ -171,8 +171,10 @@ static void wait_transaction_switching(journal_t *journal)
|
||||||
DEFINE_WAIT(wait);
|
DEFINE_WAIT(wait);
|
||||||
|
|
||||||
if (WARN_ON(!journal->j_running_transaction ||
|
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;
|
return;
|
||||||
|
}
|
||||||
prepare_to_wait(&journal->j_wait_transaction_locked, &wait,
|
prepare_to_wait(&journal->j_wait_transaction_locked, &wait,
|
||||||
TASK_UNINTERRUPTIBLE);
|
TASK_UNINTERRUPTIBLE);
|
||||||
read_unlock(&journal->j_state_lock);
|
read_unlock(&journal->j_state_lock);
|
||||||
|
|
Loading…
Reference in New Issue