Commit 26770a71 authored by Ye Bin's avatar Ye Bin Committed by Theodore Ts'o

jbd2: add prefix 'jbd2' for 'shrink_type'

As 'shrink_type' is exported. The module prefix 'jbd2' is added to
distinguish from memory reclamation.
Signed-off-by: default avatarYe Bin <yebin10@huawei.com>
Reviewed-by: default avatarJan Kara <jack@suse.cz>
Reviewed-by: default avatarZhang Yi <yi.zhang@huawei.com>
Link: https://lore.kernel.org/r/20240407065355.1528580-3-yebin10@huawei.comSigned-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
parent 078760d9
...@@ -348,7 +348,7 @@ int jbd2_cleanup_journal_tail(journal_t *journal) ...@@ -348,7 +348,7 @@ int jbd2_cleanup_journal_tail(journal_t *journal)
* Called with j_list_lock held. * Called with j_list_lock held.
*/ */
static unsigned long journal_shrink_one_cp_list(struct journal_head *jh, static unsigned long journal_shrink_one_cp_list(struct journal_head *jh,
enum shrink_type type, enum jbd2_shrink_type type,
bool *released) bool *released)
{ {
struct journal_head *last_jh; struct journal_head *last_jh;
...@@ -365,12 +365,12 @@ static unsigned long journal_shrink_one_cp_list(struct journal_head *jh, ...@@ -365,12 +365,12 @@ static unsigned long journal_shrink_one_cp_list(struct journal_head *jh,
jh = next_jh; jh = next_jh;
next_jh = jh->b_cpnext; next_jh = jh->b_cpnext;
if (type == SHRINK_DESTROY) { if (type == JBD2_SHRINK_DESTROY) {
ret = __jbd2_journal_remove_checkpoint(jh); ret = __jbd2_journal_remove_checkpoint(jh);
} else { } else {
ret = jbd2_journal_try_remove_checkpoint(jh); ret = jbd2_journal_try_remove_checkpoint(jh);
if (ret < 0) { if (ret < 0) {
if (type == SHRINK_BUSY_SKIP) if (type == JBD2_SHRINK_BUSY_SKIP)
continue; continue;
break; break;
} }
...@@ -437,7 +437,7 @@ unsigned long jbd2_journal_shrink_checkpoint_list(journal_t *journal, ...@@ -437,7 +437,7 @@ unsigned long jbd2_journal_shrink_checkpoint_list(journal_t *journal,
tid = transaction->t_tid; tid = transaction->t_tid;
freed = journal_shrink_one_cp_list(transaction->t_checkpoint_list, freed = journal_shrink_one_cp_list(transaction->t_checkpoint_list,
SHRINK_BUSY_SKIP, &released); JBD2_SHRINK_BUSY_SKIP, &released);
nr_freed += freed; nr_freed += freed;
(*nr_to_scan) -= min(*nr_to_scan, freed); (*nr_to_scan) -= min(*nr_to_scan, freed);
if (*nr_to_scan == 0) if (*nr_to_scan == 0)
...@@ -470,20 +470,20 @@ unsigned long jbd2_journal_shrink_checkpoint_list(journal_t *journal, ...@@ -470,20 +470,20 @@ unsigned long jbd2_journal_shrink_checkpoint_list(journal_t *journal,
* journal_clean_checkpoint_list * journal_clean_checkpoint_list
* *
* Find all the written-back checkpoint buffers in the journal and release them. * Find all the written-back checkpoint buffers in the journal and release them.
* If 'type' is SHRINK_DESTROY, release all buffers unconditionally. If 'type' * If 'type' is JBD2_SHRINK_DESTROY, release all buffers unconditionally. If
* is SHRINK_BUSY_STOP, will stop release buffers if encounters a busy buffer. * 'type' is JBD2_SHRINK_BUSY_STOP, will stop release buffers if encounters a
* To avoid wasting CPU cycles scanning the buffer list in some cases, don't * busy buffer. To avoid wasting CPU cycles scanning the buffer list in some
* pass SHRINK_BUSY_SKIP 'type' for this function. * cases, don't pass JBD2_SHRINK_BUSY_SKIP 'type' for this function.
* *
* Called with j_list_lock held. * Called with j_list_lock held.
*/ */
void __jbd2_journal_clean_checkpoint_list(journal_t *journal, void __jbd2_journal_clean_checkpoint_list(journal_t *journal,
enum shrink_type type) enum jbd2_shrink_type type)
{ {
transaction_t *transaction, *last_transaction, *next_transaction; transaction_t *transaction, *last_transaction, *next_transaction;
bool released; bool released;
WARN_ON_ONCE(type == SHRINK_BUSY_SKIP); WARN_ON_ONCE(type == JBD2_SHRINK_BUSY_SKIP);
transaction = journal->j_checkpoint_transactions; transaction = journal->j_checkpoint_transactions;
if (!transaction) if (!transaction)
...@@ -529,7 +529,7 @@ void jbd2_journal_destroy_checkpoint(journal_t *journal) ...@@ -529,7 +529,7 @@ void jbd2_journal_destroy_checkpoint(journal_t *journal)
spin_unlock(&journal->j_list_lock); spin_unlock(&journal->j_list_lock);
break; break;
} }
__jbd2_journal_clean_checkpoint_list(journal, SHRINK_DESTROY); __jbd2_journal_clean_checkpoint_list(journal, JBD2_SHRINK_DESTROY);
spin_unlock(&journal->j_list_lock); spin_unlock(&journal->j_list_lock);
cond_resched(); cond_resched();
} }
......
...@@ -501,7 +501,7 @@ void jbd2_journal_commit_transaction(journal_t *journal) ...@@ -501,7 +501,7 @@ void jbd2_journal_commit_transaction(journal_t *journal)
* frees some memory * frees some memory
*/ */
spin_lock(&journal->j_list_lock); spin_lock(&journal->j_list_lock);
__jbd2_journal_clean_checkpoint_list(journal, SHRINK_BUSY_STOP); __jbd2_journal_clean_checkpoint_list(journal, JBD2_SHRINK_BUSY_STOP);
spin_unlock(&journal->j_list_lock); spin_unlock(&journal->j_list_lock);
jbd2_debug(3, "JBD2: commit phase 1\n"); jbd2_debug(3, "JBD2: commit phase 1\n");
......
...@@ -1434,9 +1434,9 @@ void jbd2_update_log_tail(journal_t *journal, tid_t tid, unsigned long block); ...@@ -1434,9 +1434,9 @@ void jbd2_update_log_tail(journal_t *journal, tid_t tid, unsigned long block);
extern void jbd2_journal_commit_transaction(journal_t *); extern void jbd2_journal_commit_transaction(journal_t *);
/* Checkpoint list management */ /* Checkpoint list management */
enum shrink_type {SHRINK_DESTROY, SHRINK_BUSY_STOP, SHRINK_BUSY_SKIP}; enum jbd2_shrink_type {JBD2_SHRINK_DESTROY, JBD2_SHRINK_BUSY_STOP, JBD2_SHRINK_BUSY_SKIP};
void __jbd2_journal_clean_checkpoint_list(journal_t *journal, enum shrink_type type); void __jbd2_journal_clean_checkpoint_list(journal_t *journal, enum jbd2_shrink_type type);
unsigned long jbd2_journal_shrink_checkpoint_list(journal_t *journal, unsigned long *nr_to_scan); unsigned long jbd2_journal_shrink_checkpoint_list(journal_t *journal, unsigned long *nr_to_scan);
int __jbd2_journal_remove_checkpoint(struct journal_head *); int __jbd2_journal_remove_checkpoint(struct journal_head *);
int jbd2_journal_try_remove_checkpoint(struct journal_head *jh); int jbd2_journal_try_remove_checkpoint(struct journal_head *jh);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment