Diff v2 vs v1:
1. Update/add comment for __jbd2_journal_clean_checkpoint_list();
2. Add 'jbd2' prefix for 'shrink_type';
Ye Bin (2):
jbd2: use shrink_type type instead of bool type for
__jbd2_journal_clean_checkpoint_list()
jbd2: add prefix 'jbd2' for 'shrink_type'
fs/jbd2/checkpoint.c | 24 +++++++++++++-----------
fs/jbd2/commit.c | 2 +-
include/linux/jbd2.h | 4 +++-
3 files changed, 17 insertions(+), 13 deletions(-)
--
2.31.1
As 'shrink_type' is exported. The module prefix 'jbd2' is added to
distinguish from memory reclamation.
Signed-off-by: Ye Bin <[email protected]>
---
fs/jbd2/checkpoint.c | 22 +++++++++++-----------
fs/jbd2/commit.c | 2 +-
include/linux/jbd2.h | 4 ++--
3 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/fs/jbd2/checkpoint.c b/fs/jbd2/checkpoint.c
index 80c0ab98bc63..951f78634adf 100644
--- a/fs/jbd2/checkpoint.c
+++ b/fs/jbd2/checkpoint.c
@@ -348,7 +348,7 @@ int jbd2_cleanup_journal_tail(journal_t *journal)
* Called with j_list_lock held.
*/
static unsigned long journal_shrink_one_cp_list(struct journal_head *jh,
- enum shrink_type type,
+ enum jbd2_shrink_type type,
bool *released)
{
struct journal_head *last_jh;
@@ -365,12 +365,12 @@ static unsigned long journal_shrink_one_cp_list(struct journal_head *jh,
jh = next_jh;
next_jh = jh->b_cpnext;
- if (type == SHRINK_DESTROY) {
+ if (type == JBD2_SHRINK_DESTROY) {
ret = __jbd2_journal_remove_checkpoint(jh);
} else {
ret = jbd2_journal_try_remove_checkpoint(jh);
if (ret < 0) {
- if (type == SHRINK_BUSY_SKIP)
+ if (type == JBD2_SHRINK_BUSY_SKIP)
continue;
break;
}
@@ -437,7 +437,7 @@ unsigned long jbd2_journal_shrink_checkpoint_list(journal_t *journal,
tid = transaction->t_tid;
freed = journal_shrink_one_cp_list(transaction->t_checkpoint_list,
- SHRINK_BUSY_SKIP, &released);
+ JBD2_SHRINK_BUSY_SKIP, &released);
nr_freed += freed;
(*nr_to_scan) -= min(*nr_to_scan, freed);
if (*nr_to_scan == 0)
@@ -470,20 +470,20 @@ unsigned long jbd2_journal_shrink_checkpoint_list(journal_t *journal,
* journal_clean_checkpoint_list
*
* Find all the written-back checkpoint buffers in the journal and release them.
- * If 'type' is SHRINK_DESTROY, release all buffers unconditionally. If 'type'
- * is SHRINK_BUSY_STOP, will stop release buffers if encounters a busy buffer.
- * To avoid wasting CPU cycles scanning the buffer list in some cases, don't
- * pass SHRINK_BUSY_SKIP 'type' for this function.
+ * If 'type' is JBD2_SHRINK_DESTROY, release all buffers unconditionally. If
+ * 'type' is JBD2_SHRINK_BUSY_STOP, will stop release buffers if encounters a
+ * busy buffer. To avoid wasting CPU cycles scanning the buffer list in some
+ * cases, don't pass JBD2_SHRINK_BUSY_SKIP 'type' for this function.
*
* Called with j_list_lock held.
*/
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;
bool released;
- WARN_ON_ONCE(type == SHRINK_BUSY_SKIP);
+ WARN_ON_ONCE(type == JBD2_SHRINK_BUSY_SKIP);
transaction = journal->j_checkpoint_transactions;
if (!transaction)
@@ -529,7 +529,7 @@ void jbd2_journal_destroy_checkpoint(journal_t *journal)
spin_unlock(&journal->j_list_lock);
break;
}
- __jbd2_journal_clean_checkpoint_list(journal, SHRINK_DESTROY);
+ __jbd2_journal_clean_checkpoint_list(journal, JBD2_SHRINK_DESTROY);
spin_unlock(&journal->j_list_lock);
cond_resched();
}
diff --git a/fs/jbd2/commit.c b/fs/jbd2/commit.c
index 78ebd04ac97d..65c857ab49ec 100644
--- a/fs/jbd2/commit.c
+++ b/fs/jbd2/commit.c
@@ -501,7 +501,7 @@ void jbd2_journal_commit_transaction(journal_t *journal)
* frees some memory
*/
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);
jbd2_debug(3, "JBD2: commit phase 1\n");
diff --git a/include/linux/jbd2.h b/include/linux/jbd2.h
index 58a961999d70..7479f64c0939 100644
--- a/include/linux/jbd2.h
+++ b/include/linux/jbd2.h
@@ -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 *);
/* 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);
int __jbd2_journal_remove_checkpoint(struct journal_head *);
int jbd2_journal_try_remove_checkpoint(struct journal_head *jh);
--
2.31.1
On Sun 07-04-24 14:53:55, Ye Bin wrote:
> As 'shrink_type' is exported. The module prefix 'jbd2' is added to
> distinguish from memory reclamation.
>
> Signed-off-by: Ye Bin <[email protected]>
Looks good. Feel free to add:
Reviewed-by: Jan Kara <[email protected]>
Honza
> ---
> fs/jbd2/checkpoint.c | 22 +++++++++++-----------
> fs/jbd2/commit.c | 2 +-
> include/linux/jbd2.h | 4 ++--
> 3 files changed, 14 insertions(+), 14 deletions(-)
>
> diff --git a/fs/jbd2/checkpoint.c b/fs/jbd2/checkpoint.c
> index 80c0ab98bc63..951f78634adf 100644
> --- a/fs/jbd2/checkpoint.c
> +++ b/fs/jbd2/checkpoint.c
> @@ -348,7 +348,7 @@ int jbd2_cleanup_journal_tail(journal_t *journal)
> * Called with j_list_lock held.
> */
> static unsigned long journal_shrink_one_cp_list(struct journal_head *jh,
> - enum shrink_type type,
> + enum jbd2_shrink_type type,
> bool *released)
> {
> struct journal_head *last_jh;
> @@ -365,12 +365,12 @@ static unsigned long journal_shrink_one_cp_list(struct journal_head *jh,
> jh = next_jh;
> next_jh = jh->b_cpnext;
>
> - if (type == SHRINK_DESTROY) {
> + if (type == JBD2_SHRINK_DESTROY) {
> ret = __jbd2_journal_remove_checkpoint(jh);
> } else {
> ret = jbd2_journal_try_remove_checkpoint(jh);
> if (ret < 0) {
> - if (type == SHRINK_BUSY_SKIP)
> + if (type == JBD2_SHRINK_BUSY_SKIP)
> continue;
> break;
> }
> @@ -437,7 +437,7 @@ unsigned long jbd2_journal_shrink_checkpoint_list(journal_t *journal,
> tid = transaction->t_tid;
>
> freed = journal_shrink_one_cp_list(transaction->t_checkpoint_list,
> - SHRINK_BUSY_SKIP, &released);
> + JBD2_SHRINK_BUSY_SKIP, &released);
> nr_freed += freed;
> (*nr_to_scan) -= min(*nr_to_scan, freed);
> if (*nr_to_scan == 0)
> @@ -470,20 +470,20 @@ unsigned long jbd2_journal_shrink_checkpoint_list(journal_t *journal,
> * journal_clean_checkpoint_list
> *
> * Find all the written-back checkpoint buffers in the journal and release them.
> - * If 'type' is SHRINK_DESTROY, release all buffers unconditionally. If 'type'
> - * is SHRINK_BUSY_STOP, will stop release buffers if encounters a busy buffer.
> - * To avoid wasting CPU cycles scanning the buffer list in some cases, don't
> - * pass SHRINK_BUSY_SKIP 'type' for this function.
> + * If 'type' is JBD2_SHRINK_DESTROY, release all buffers unconditionally. If
> + * 'type' is JBD2_SHRINK_BUSY_STOP, will stop release buffers if encounters a
> + * busy buffer. To avoid wasting CPU cycles scanning the buffer list in some
> + * cases, don't pass JBD2_SHRINK_BUSY_SKIP 'type' for this function.
> *
> * Called with j_list_lock held.
> */
> 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;
> bool released;
>
> - WARN_ON_ONCE(type == SHRINK_BUSY_SKIP);
> + WARN_ON_ONCE(type == JBD2_SHRINK_BUSY_SKIP);
>
> transaction = journal->j_checkpoint_transactions;
> if (!transaction)
> @@ -529,7 +529,7 @@ void jbd2_journal_destroy_checkpoint(journal_t *journal)
> spin_unlock(&journal->j_list_lock);
> break;
> }
> - __jbd2_journal_clean_checkpoint_list(journal, SHRINK_DESTROY);
> + __jbd2_journal_clean_checkpoint_list(journal, JBD2_SHRINK_DESTROY);
> spin_unlock(&journal->j_list_lock);
> cond_resched();
> }
> diff --git a/fs/jbd2/commit.c b/fs/jbd2/commit.c
> index 78ebd04ac97d..65c857ab49ec 100644
> --- a/fs/jbd2/commit.c
> +++ b/fs/jbd2/commit.c
> @@ -501,7 +501,7 @@ void jbd2_journal_commit_transaction(journal_t *journal)
> * frees some memory
> */
> 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);
>
> jbd2_debug(3, "JBD2: commit phase 1\n");
> diff --git a/include/linux/jbd2.h b/include/linux/jbd2.h
> index 58a961999d70..7479f64c0939 100644
> --- a/include/linux/jbd2.h
> +++ b/include/linux/jbd2.h
> @@ -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 *);
>
> /* 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);
> int __jbd2_journal_remove_checkpoint(struct journal_head *);
> int jbd2_journal_try_remove_checkpoint(struct journal_head *jh);
> --
> 2.31.1
>
--
Jan Kara <[email protected]>
SUSE Labs, CR
On 2024/4/7 14:53, Ye Bin wrote:
> As 'shrink_type' is exported. The module prefix 'jbd2' is added to
> distinguish from memory reclamation.
>
> Signed-off-by: Ye Bin <[email protected]>
Looks nice.
Reviewed-by: Zhang Yi <[email protected]>
> ---
> fs/jbd2/checkpoint.c | 22 +++++++++++-----------
> fs/jbd2/commit.c | 2 +-
> include/linux/jbd2.h | 4 ++--
> 3 files changed, 14 insertions(+), 14 deletions(-)
>
> diff --git a/fs/jbd2/checkpoint.c b/fs/jbd2/checkpoint.c
> index 80c0ab98bc63..951f78634adf 100644
> --- a/fs/jbd2/checkpoint.c
> +++ b/fs/jbd2/checkpoint.c
> @@ -348,7 +348,7 @@ int jbd2_cleanup_journal_tail(journal_t *journal)
> * Called with j_list_lock held.
> */
> static unsigned long journal_shrink_one_cp_list(struct journal_head *jh,
> - enum shrink_type type,
> + enum jbd2_shrink_type type,
> bool *released)
> {
> struct journal_head *last_jh;
> @@ -365,12 +365,12 @@ static unsigned long journal_shrink_one_cp_list(struct journal_head *jh,
> jh = next_jh;
> next_jh = jh->b_cpnext;
>
> - if (type == SHRINK_DESTROY) {
> + if (type == JBD2_SHRINK_DESTROY) {
> ret = __jbd2_journal_remove_checkpoint(jh);
> } else {
> ret = jbd2_journal_try_remove_checkpoint(jh);
> if (ret < 0) {
> - if (type == SHRINK_BUSY_SKIP)
> + if (type == JBD2_SHRINK_BUSY_SKIP)
> continue;
> break;
> }
> @@ -437,7 +437,7 @@ unsigned long jbd2_journal_shrink_checkpoint_list(journal_t *journal,
> tid = transaction->t_tid;
>
> freed = journal_shrink_one_cp_list(transaction->t_checkpoint_list,
> - SHRINK_BUSY_SKIP, &released);
> + JBD2_SHRINK_BUSY_SKIP, &released);
> nr_freed += freed;
> (*nr_to_scan) -= min(*nr_to_scan, freed);
> if (*nr_to_scan == 0)
> @@ -470,20 +470,20 @@ unsigned long jbd2_journal_shrink_checkpoint_list(journal_t *journal,
> * journal_clean_checkpoint_list
> *
> * Find all the written-back checkpoint buffers in the journal and release them.
> - * If 'type' is SHRINK_DESTROY, release all buffers unconditionally. If 'type'
> - * is SHRINK_BUSY_STOP, will stop release buffers if encounters a busy buffer.
> - * To avoid wasting CPU cycles scanning the buffer list in some cases, don't
> - * pass SHRINK_BUSY_SKIP 'type' for this function.
> + * If 'type' is JBD2_SHRINK_DESTROY, release all buffers unconditionally. If
> + * 'type' is JBD2_SHRINK_BUSY_STOP, will stop release buffers if encounters a
> + * busy buffer. To avoid wasting CPU cycles scanning the buffer list in some
> + * cases, don't pass JBD2_SHRINK_BUSY_SKIP 'type' for this function.
> *
> * Called with j_list_lock held.
> */
> 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;
> bool released;
>
> - WARN_ON_ONCE(type == SHRINK_BUSY_SKIP);
> + WARN_ON_ONCE(type == JBD2_SHRINK_BUSY_SKIP);
>
> transaction = journal->j_checkpoint_transactions;
> if (!transaction)
> @@ -529,7 +529,7 @@ void jbd2_journal_destroy_checkpoint(journal_t *journal)
> spin_unlock(&journal->j_list_lock);
> break;
> }
> - __jbd2_journal_clean_checkpoint_list(journal, SHRINK_DESTROY);
> + __jbd2_journal_clean_checkpoint_list(journal, JBD2_SHRINK_DESTROY);
> spin_unlock(&journal->j_list_lock);
> cond_resched();
> }
> diff --git a/fs/jbd2/commit.c b/fs/jbd2/commit.c
> index 78ebd04ac97d..65c857ab49ec 100644
> --- a/fs/jbd2/commit.c
> +++ b/fs/jbd2/commit.c
> @@ -501,7 +501,7 @@ void jbd2_journal_commit_transaction(journal_t *journal)
> * frees some memory
> */
> 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);
>
> jbd2_debug(3, "JBD2: commit phase 1\n");
> diff --git a/include/linux/jbd2.h b/include/linux/jbd2.h
> index 58a961999d70..7479f64c0939 100644
> --- a/include/linux/jbd2.h
> +++ b/include/linux/jbd2.h
> @@ -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 *);
>
> /* 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);
> int __jbd2_journal_remove_checkpoint(struct journal_head *);
> int jbd2_journal_try_remove_checkpoint(struct journal_head *jh);
>