[v1] Fix and cleanups to jbd2

[PATCH 3/7] jbd2: remove unused return value of jbd2_fc_release_bufs

Posted by Kemeng Shi 1 year, 6 months ago

Remove unused return value of jbd2_fc_release_bufs.

Signed-off-by: Kemeng Shi <shikemeng@huaweicloud.com>
---
 fs/jbd2/journal.c    | 4 +---
 include/linux/jbd2.h | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/fs/jbd2/journal.c b/fs/jbd2/journal.c
index b5d02de1ffff..312c7575b54f 100644
--- a/fs/jbd2/journal.c
+++ b/fs/jbd2/journal.c
@@ -903,7 +903,7 @@ int jbd2_fc_wait_bufs(journal_t *journal, int num_blks)
 }
 EXPORT_SYMBOL(jbd2_fc_wait_bufs);
 
-int jbd2_fc_release_bufs(journal_t *journal)
+void jbd2_fc_release_bufs(journal_t *journal)
 {
 	struct buffer_head *bh;
 	int i, j_fc_off;
@@ -917,8 +917,6 @@ int jbd2_fc_release_bufs(journal_t *journal)
 		put_bh(bh);
 		journal->j_fc_wbuf[i] = NULL;
 	}
-
-	return 0;
 }
 EXPORT_SYMBOL(jbd2_fc_release_bufs);
 
diff --git a/include/linux/jbd2.h b/include/linux/jbd2.h
index b900c642210c..735229e8ad17 100644
--- a/include/linux/jbd2.h
+++ b/include/linux/jbd2.h
@@ -1665,7 +1665,7 @@ int jbd2_fc_get_buf(journal_t *journal, struct buffer_head **bh_out);
 int jbd2_submit_inode_data(journal_t *journal, struct jbd2_inode *jinode);
 int jbd2_wait_inode_data(journal_t *journal, struct jbd2_inode *jinode);
 int jbd2_fc_wait_bufs(journal_t *journal, int num_blks);
-int jbd2_fc_release_bufs(journal_t *journal);
+void jbd2_fc_release_bufs(journal_t *journal);
 
 /*
  * is_journal_abort
-- 
2.30.0

Re: [PATCH 3/7] jbd2: remove unused return value of jbd2_fc_release_bufs

Posted by Zhang Yi 1 year, 6 months ago

On 2024/7/30 19:33, Kemeng Shi wrote:
> Remove unused return value of jbd2_fc_release_bufs.
> 
> Signed-off-by: Kemeng Shi <shikemeng@huaweicloud.com>

Looks good to me.

Reviewed-by: Zhang Yi <yi.zhang@huawei.com>

> ---
>  fs/jbd2/journal.c    | 4 +---
>  include/linux/jbd2.h | 2 +-
>  2 files changed, 2 insertions(+), 4 deletions(-)
> 
> diff --git a/fs/jbd2/journal.c b/fs/jbd2/journal.c
> index b5d02de1ffff..312c7575b54f 100644
> --- a/fs/jbd2/journal.c
> +++ b/fs/jbd2/journal.c
> @@ -903,7 +903,7 @@ int jbd2_fc_wait_bufs(journal_t *journal, int num_blks)
>  }
>  EXPORT_SYMBOL(jbd2_fc_wait_bufs);
>  
> -int jbd2_fc_release_bufs(journal_t *journal)
> +void jbd2_fc_release_bufs(journal_t *journal)
>  {
>  	struct buffer_head *bh;
>  	int i, j_fc_off;
> @@ -917,8 +917,6 @@ int jbd2_fc_release_bufs(journal_t *journal)
>  		put_bh(bh);
>  		journal->j_fc_wbuf[i] = NULL;
>  	}
> -
> -	return 0;
>  }
>  EXPORT_SYMBOL(jbd2_fc_release_bufs);
>  
> diff --git a/include/linux/jbd2.h b/include/linux/jbd2.h
> index b900c642210c..735229e8ad17 100644
> --- a/include/linux/jbd2.h
> +++ b/include/linux/jbd2.h
> @@ -1665,7 +1665,7 @@ int jbd2_fc_get_buf(journal_t *journal, struct buffer_head **bh_out);
>  int jbd2_submit_inode_data(journal_t *journal, struct jbd2_inode *jinode);
>  int jbd2_wait_inode_data(journal_t *journal, struct jbd2_inode *jinode);
>  int jbd2_fc_wait_bufs(journal_t *journal, int num_blks);
> -int jbd2_fc_release_bufs(journal_t *journal);
> +void jbd2_fc_release_bufs(journal_t *journal);
>  
>  /*
>   * is_journal_abort
>

Re: [PATCH 3/7] jbd2: remove unused return value of jbd2_fc_release_bufs

Posted by Jan Kara 1 year, 6 months ago

On Tue 30-07-24 19:33:31, Kemeng Shi wrote:
> Remove unused return value of jbd2_fc_release_bufs.
> 
> Signed-off-by: Kemeng Shi <shikemeng@huaweicloud.com>

Looks good. Feel free to add:

Reviewed-by: Jan Kara <jack@suse.cz>

								Honza

> ---
>  fs/jbd2/journal.c    | 4 +---
>  include/linux/jbd2.h | 2 +-
>  2 files changed, 2 insertions(+), 4 deletions(-)
> 
> diff --git a/fs/jbd2/journal.c b/fs/jbd2/journal.c
> index b5d02de1ffff..312c7575b54f 100644
> --- a/fs/jbd2/journal.c
> +++ b/fs/jbd2/journal.c
> @@ -903,7 +903,7 @@ int jbd2_fc_wait_bufs(journal_t *journal, int num_blks)
>  }
>  EXPORT_SYMBOL(jbd2_fc_wait_bufs);
>  
> -int jbd2_fc_release_bufs(journal_t *journal)
> +void jbd2_fc_release_bufs(journal_t *journal)
>  {
>  	struct buffer_head *bh;
>  	int i, j_fc_off;
> @@ -917,8 +917,6 @@ int jbd2_fc_release_bufs(journal_t *journal)
>  		put_bh(bh);
>  		journal->j_fc_wbuf[i] = NULL;
>  	}
> -
> -	return 0;
>  }
>  EXPORT_SYMBOL(jbd2_fc_release_bufs);
>  
> diff --git a/include/linux/jbd2.h b/include/linux/jbd2.h
> index b900c642210c..735229e8ad17 100644
> --- a/include/linux/jbd2.h
> +++ b/include/linux/jbd2.h
> @@ -1665,7 +1665,7 @@ int jbd2_fc_get_buf(journal_t *journal, struct buffer_head **bh_out);
>  int jbd2_submit_inode_data(journal_t *journal, struct jbd2_inode *jinode);
>  int jbd2_wait_inode_data(journal_t *journal, struct jbd2_inode *jinode);
>  int jbd2_fc_wait_bufs(journal_t *journal, int num_blks);
> -int jbd2_fc_release_bufs(journal_t *journal);
> +void jbd2_fc_release_bufs(journal_t *journal);
>  
>  /*
>   * is_journal_abort
> -- 
> 2.30.0
> 
-- 
Jan Kara <jack@suse.com>
SUSE Labs, CR