Skip to content

Commit b33d9f5

Browse files
committed
jbd2: add sparse annotations for add_transaction_credits()
Signed-off-by: Theodore Ts'o <[email protected]>
1 parent a5fda11 commit b33d9f5

File tree

1 file changed

+18
-1
lines changed

1 file changed

+18
-1
lines changed

fs/jbd2/transaction.c

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,9 +223,15 @@ static void sub_reserved_credits(journal_t *journal, int blocks)
223223
* with j_state_lock held for reading. Returns 0 if handle joined the running
224224
* transaction. Returns 1 if we had to wait, j_state_lock is dropped, and
225225
* caller must retry.
226+
*
227+
* Note: because j_state_lock may be dropped depending on the return
228+
* value, we need to fake out sparse so ti doesn't complain about a
229+
* locking imbalance. Callers of add_transaction_credits will need to
230+
* make a similar accomodation.
226231
*/
227232
static int add_transaction_credits(journal_t *journal, int blocks,
228233
int rsv_blocks)
234+
__must_hold(&journal->j_state_lock)
229235
{
230236
transaction_t *t = journal->j_running_transaction;
231237
int needed;
@@ -238,6 +244,7 @@ static int add_transaction_credits(journal_t *journal, int blocks,
238244
if (t->t_state != T_RUNNING) {
239245
WARN_ON_ONCE(t->t_state >= T_FLUSH);
240246
wait_transaction_locked(journal);
247+
__acquire(&journal->j_state_lock); /* fake out sparse */
241248
return 1;
242249
}
243250

@@ -266,10 +273,12 @@ static int add_transaction_credits(journal_t *journal, int blocks,
266273
wait_event(journal->j_wait_reserved,
267274
atomic_read(&journal->j_reserved_credits) + total <=
268275
journal->j_max_transaction_buffers);
276+
__acquire(&journal->j_state_lock); /* fake out sparse */
269277
return 1;
270278
}
271279

272280
wait_transaction_locked(journal);
281+
__acquire(&journal->j_state_lock); /* fake out sparse */
273282
return 1;
274283
}
275284

@@ -293,6 +302,7 @@ static int add_transaction_credits(journal_t *journal, int blocks,
293302
journal->j_max_transaction_buffers)
294303
__jbd2_log_wait_for_space(journal);
295304
write_unlock(&journal->j_state_lock);
305+
__acquire(&journal->j_state_lock); /* fake out sparse */
296306
return 1;
297307
}
298308

@@ -310,6 +320,7 @@ static int add_transaction_credits(journal_t *journal, int blocks,
310320
wait_event(journal->j_wait_reserved,
311321
atomic_read(&journal->j_reserved_credits) + rsv_blocks
312322
<= journal->j_max_transaction_buffers / 2);
323+
__acquire(&journal->j_state_lock); /* fake out sparse */
313324
return 1;
314325
}
315326
return 0;
@@ -413,8 +424,14 @@ static int start_this_handle(journal_t *journal, handle_t *handle,
413424

414425
if (!handle->h_reserved) {
415426
/* We may have dropped j_state_lock - restart in that case */
416-
if (add_transaction_credits(journal, blocks, rsv_blocks))
427+
if (add_transaction_credits(journal, blocks, rsv_blocks)) {
428+
/*
429+
* add_transaction_credits releases
430+
* j_state_lock on a non-zero return
431+
*/
432+
__release(&journal->j_state_lock);
417433
goto repeat;
434+
}
418435
} else {
419436
/*
420437
* We have handle reserved so we are allowed to join T_LOCKED

0 commit comments

Comments
 (0)