@@ -348,7 +348,7 @@ int jbd2_cleanup_journal_tail(journal_t *journal)
348
348
* Called with j_list_lock held.
349
349
*/
350
350
static unsigned long journal_shrink_one_cp_list (struct journal_head * jh ,
351
- enum shrink_type type ,
351
+ enum jbd2_shrink_type type ,
352
352
bool * released )
353
353
{
354
354
struct journal_head * last_jh ;
@@ -365,12 +365,12 @@ static unsigned long journal_shrink_one_cp_list(struct journal_head *jh,
365
365
jh = next_jh ;
366
366
next_jh = jh -> b_cpnext ;
367
367
368
- if (type == SHRINK_DESTROY ) {
368
+ if (type == JBD2_SHRINK_DESTROY ) {
369
369
ret = __jbd2_journal_remove_checkpoint (jh );
370
370
} else {
371
371
ret = jbd2_journal_try_remove_checkpoint (jh );
372
372
if (ret < 0 ) {
373
- if (type == SHRINK_BUSY_SKIP )
373
+ if (type == JBD2_SHRINK_BUSY_SKIP )
374
374
continue ;
375
375
break ;
376
376
}
@@ -437,7 +437,7 @@ unsigned long jbd2_journal_shrink_checkpoint_list(journal_t *journal,
437
437
tid = transaction -> t_tid ;
438
438
439
439
freed = journal_shrink_one_cp_list (transaction -> t_checkpoint_list ,
440
- SHRINK_BUSY_SKIP , & released );
440
+ JBD2_SHRINK_BUSY_SKIP , & released );
441
441
nr_freed += freed ;
442
442
(* nr_to_scan ) -= min (* nr_to_scan , freed );
443
443
if (* nr_to_scan == 0 )
@@ -470,20 +470,20 @@ unsigned long jbd2_journal_shrink_checkpoint_list(journal_t *journal,
470
470
* journal_clean_checkpoint_list
471
471
*
472
472
* Find all the written-back checkpoint buffers in the journal and release them.
473
- * If 'type' is SHRINK_DESTROY , release all buffers unconditionally. If 'type'
474
- * is SHRINK_BUSY_STOP , will stop release buffers if encounters a busy buffer.
475
- * To avoid wasting CPU cycles scanning the buffer list in some cases, don't
476
- * pass SHRINK_BUSY_SKIP 'type' for this function.
473
+ * If 'type' is JBD2_SHRINK_DESTROY , release all buffers unconditionally. If
474
+ * 'type' is JBD2_SHRINK_BUSY_STOP , will stop release buffers if encounters a
475
+ * busy buffer. To avoid wasting CPU cycles scanning the buffer list in some
476
+ * cases, don't pass JBD2_SHRINK_BUSY_SKIP 'type' for this function.
477
477
*
478
478
* Called with j_list_lock held.
479
479
*/
480
480
void __jbd2_journal_clean_checkpoint_list (journal_t * journal ,
481
- enum shrink_type type )
481
+ enum jbd2_shrink_type type )
482
482
{
483
483
transaction_t * transaction , * last_transaction , * next_transaction ;
484
484
bool released ;
485
485
486
- WARN_ON_ONCE (type == SHRINK_BUSY_SKIP );
486
+ WARN_ON_ONCE (type == JBD2_SHRINK_BUSY_SKIP );
487
487
488
488
transaction = journal -> j_checkpoint_transactions ;
489
489
if (!transaction )
@@ -529,7 +529,7 @@ void jbd2_journal_destroy_checkpoint(journal_t *journal)
529
529
spin_unlock (& journal -> j_list_lock );
530
530
break ;
531
531
}
532
- __jbd2_journal_clean_checkpoint_list (journal , SHRINK_DESTROY );
532
+ __jbd2_journal_clean_checkpoint_list (journal , JBD2_SHRINK_DESTROY );
533
533
spin_unlock (& journal -> j_list_lock );
534
534
cond_resched ();
535
535
}
0 commit comments