diff mbox series

[2/4] btrfs: sink gfp_t parameter to btrfs_qgroup_trace_extent

Message ID 851400b247c547bd420dafa4b7ae78345f4a7ae4.1666103172.git.dsterba@suse.com (mailing list archive)
State New, archived
Headers show
Series Parameter cleanup | expand

Commit Message

David Sterba Oct. 18, 2022, 2:27 p.m. UTC 
All callers pass GFP_NOFS, we can drop the parameter and use it
directly.

Signed-off-by: David Sterba <dsterba@suse.com>
---
 fs/btrfs/qgroup.c     | 17 +++++++----------
 fs/btrfs/qgroup.h     |  2 +-
 fs/btrfs/relocation.c |  2 +-
 fs/btrfs/tree-log.c   |  3 +--
 4 files changed, 10 insertions(+), 14 deletions(-)

Comments

Anand Jain Oct. 20, 2022, 6:01 a.m. UTC | #1 
On 18/10/2022 22:27, David Sterba wrote:
> All callers pass GFP_NOFS, we can drop the parameter and use it
> directly.
> 
> Signed-off-by: David Sterba <dsterba@suse.com>
> ---
>   fs/btrfs/qgroup.c     | 17 +++++++----------
>   fs/btrfs/qgroup.h     |  2 +-
>   fs/btrfs/relocation.c |  2 +-
>   fs/btrfs/tree-log.c   |  3 +--
>   4 files changed, 10 insertions(+), 14 deletions(-)
> 
> diff --git a/fs/btrfs/qgroup.c b/fs/btrfs/qgroup.c
> index 9334c3157c22..34f0e4dabe25 100644
> --- a/fs/btrfs/qgroup.c
> +++ b/fs/btrfs/qgroup.c
> @@ -1840,7 +1840,7 @@ int btrfs_qgroup_trace_extent_post(struct btrfs_trans_handle *trans,
>   }
>   
>   int btrfs_qgroup_trace_extent(struct btrfs_trans_handle *trans, u64 bytenr,
> -			      u64 num_bytes, gfp_t gfp_flag)
> +			      u64 num_bytes)
>   {
>   	struct btrfs_fs_info *fs_info = trans->fs_info;
>   	struct btrfs_qgroup_extent_record *record;
> @@ -1850,7 +1850,7 @@ int btrfs_qgroup_trace_extent(struct btrfs_trans_handle *trans, u64 bytenr,
>   	if (!test_bit(BTRFS_FS_QUOTA_ENABLED, &fs_info->flags)
>   	    || bytenr == 0 || num_bytes == 0)
>   		return 0;
> -	record = kzalloc(sizeof(*record), gfp_flag);
> +	record = kzalloc(sizeof(*record), GFP_NOFS);
>   	if (!record)
>   		return -ENOMEM;
>   
> @@ -1902,8 +1902,7 @@ int btrfs_qgroup_trace_leaf_items(struct btrfs_trans_handle *trans,
>   
>   		num_bytes = btrfs_file_extent_disk_num_bytes(eb, fi);
>   
> -		ret = btrfs_qgroup_trace_extent(trans, bytenr, num_bytes,
> -						GFP_NOFS);
> +		ret = btrfs_qgroup_trace_extent(trans, bytenr, num_bytes);
>   		if (ret)
>   			return ret;
>   	}
> @@ -2102,12 +2101,11 @@ static int qgroup_trace_extent_swap(struct btrfs_trans_handle* trans,
>   	 * blocks for qgroup accounting.
>   	 */
>   	ret = btrfs_qgroup_trace_extent(trans, src_path->nodes[dst_level]->start,
> -			nodesize, GFP_NOFS);
> +					nodesize);
>   	if (ret < 0)
>   		goto out;
> -	ret = btrfs_qgroup_trace_extent(trans,
> -			dst_path->nodes[dst_level]->start,
> -			nodesize, GFP_NOFS);
> +	ret = btrfs_qgroup_trace_extent(trans, dst_path->nodes[dst_level]->start,
> +					nodesize);
>   	if (ret < 0)
>   		goto out;
>   
> @@ -2391,8 +2389,7 @@ int btrfs_qgroup_trace_subtree(struct btrfs_trans_handle *trans,
>   			path->locks[level] = BTRFS_READ_LOCK;
>   
>   			ret = btrfs_qgroup_trace_extent(trans, child_bytenr,
> -							fs_info->nodesize,
> -							GFP_NOFS);
> +							fs_info->nodesize);
>   			if (ret)
>   				goto out;
>   		}
> diff --git a/fs/btrfs/qgroup.h b/fs/btrfs/qgroup.h
> index 3fb5459c9309..7bffa10589d6 100644
> --- a/fs/btrfs/qgroup.h
> +++ b/fs/btrfs/qgroup.h
> @@ -321,7 +321,7 @@ int btrfs_qgroup_trace_extent_post(struct btrfs_trans_handle *trans,
>    * (NULL trans)
>    */
>   int btrfs_qgroup_trace_extent(struct btrfs_trans_handle *trans, u64 bytenr,
> -			      u64 num_bytes, gfp_t gfp_flag);
> +			      u64 num_bytes);
>   
>   /*
>    * Inform qgroup to trace all leaf items of data



> diff --git a/fs/btrfs/relocation.c b/fs/btrfs/relocation.c
> index 216a4485d914..f5564aa313f5 100644
> --- a/fs/btrfs/relocation.c
> +++ b/fs/btrfs/relocation.c
> @@ -471,7 +471,7 @@ static noinline_for_stack struct btrfs_backref_node *build_backref_tree(
>   	int ret;
>   	int err = 0;
>   
> -	iter = btrfs_backref_iter_alloc(rc->extent_root->fs_info, GFP_NOFS);
> +	iter = btrfs_backref_iter_alloc(rc->extent_root->fs_info);
>   	if (!iter)
>   		return ERR_PTR(-ENOMEM);
>   	path = btrfs_alloc_path();


  This change should be part of the patch 1/4.
  Except that, rest looks good.


-Anand

> diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c
> index 813986e38258..3b44b325aba6 100644
> --- a/fs/btrfs/tree-log.c
> +++ b/fs/btrfs/tree-log.c
> @@ -747,8 +747,7 @@ static noinline int replay_one_extent(struct btrfs_trans_handle *trans,
>   		 */
>   		ret = btrfs_qgroup_trace_extent(trans,
>   				btrfs_file_extent_disk_bytenr(eb, item),
> -				btrfs_file_extent_disk_num_bytes(eb, item),
> -				GFP_NOFS);
> +				btrfs_file_extent_disk_num_bytes(eb, item));
>   		if (ret < 0)
>   			goto out;
>
David Sterba Oct. 20, 2022, 4:39 p.m. UTC | #2 
On Thu, Oct 20, 2022 at 02:01:56PM +0800, Anand Jain wrote:
> On 18/10/2022 22:27, David Sterba wrote:
> > All callers pass GFP_NOFS, we can drop the parameter and use it
> > directly.
> > 
> > Signed-off-by: David Sterba <dsterba@suse.com>
> > ---
> >   fs/btrfs/qgroup.c     | 17 +++++++----------
> >   fs/btrfs/qgroup.h     |  2 +-
> >   fs/btrfs/relocation.c |  2 +-
> >   fs/btrfs/tree-log.c   |  3 +--
> >   4 files changed, 10 insertions(+), 14 deletions(-)
> > 
> > diff --git a/fs/btrfs/qgroup.c b/fs/btrfs/qgroup.c
> > index 9334c3157c22..34f0e4dabe25 100644
> > --- a/fs/btrfs/qgroup.c
> > +++ b/fs/btrfs/qgroup.c
> > @@ -1840,7 +1840,7 @@ int btrfs_qgroup_trace_extent_post(struct btrfs_trans_handle *trans,
> >   }
> >   
> >   int btrfs_qgroup_trace_extent(struct btrfs_trans_handle *trans, u64 bytenr,
> > -			      u64 num_bytes, gfp_t gfp_flag)
> > +			      u64 num_bytes)
> >   {
> >   	struct btrfs_fs_info *fs_info = trans->fs_info;
> >   	struct btrfs_qgroup_extent_record *record;
> > @@ -1850,7 +1850,7 @@ int btrfs_qgroup_trace_extent(struct btrfs_trans_handle *trans, u64 bytenr,
> >   	if (!test_bit(BTRFS_FS_QUOTA_ENABLED, &fs_info->flags)
> >   	    || bytenr == 0 || num_bytes == 0)
> >   		return 0;
> > -	record = kzalloc(sizeof(*record), gfp_flag);
> > +	record = kzalloc(sizeof(*record), GFP_NOFS);
> >   	if (!record)
> >   		return -ENOMEM;
> >   
> > @@ -1902,8 +1902,7 @@ int btrfs_qgroup_trace_leaf_items(struct btrfs_trans_handle *trans,
> >   
> >   		num_bytes = btrfs_file_extent_disk_num_bytes(eb, fi);
> >   
> > -		ret = btrfs_qgroup_trace_extent(trans, bytenr, num_bytes,
> > -						GFP_NOFS);
> > +		ret = btrfs_qgroup_trace_extent(trans, bytenr, num_bytes);
> >   		if (ret)
> >   			return ret;
> >   	}
> > @@ -2102,12 +2101,11 @@ static int qgroup_trace_extent_swap(struct btrfs_trans_handle* trans,
> >   	 * blocks for qgroup accounting.
> >   	 */
> >   	ret = btrfs_qgroup_trace_extent(trans, src_path->nodes[dst_level]->start,
> > -			nodesize, GFP_NOFS);
> > +					nodesize);
> >   	if (ret < 0)
> >   		goto out;
> > -	ret = btrfs_qgroup_trace_extent(trans,
> > -			dst_path->nodes[dst_level]->start,
> > -			nodesize, GFP_NOFS);
> > +	ret = btrfs_qgroup_trace_extent(trans, dst_path->nodes[dst_level]->start,
> > +					nodesize);
> >   	if (ret < 0)
> >   		goto out;
> >   
> > @@ -2391,8 +2389,7 @@ int btrfs_qgroup_trace_subtree(struct btrfs_trans_handle *trans,
> >   			path->locks[level] = BTRFS_READ_LOCK;
> >   
> >   			ret = btrfs_qgroup_trace_extent(trans, child_bytenr,
> > -							fs_info->nodesize,
> > -							GFP_NOFS);
> > +							fs_info->nodesize);
> >   			if (ret)
> >   				goto out;
> >   		}
> > diff --git a/fs/btrfs/qgroup.h b/fs/btrfs/qgroup.h
> > index 3fb5459c9309..7bffa10589d6 100644
> > --- a/fs/btrfs/qgroup.h
> > +++ b/fs/btrfs/qgroup.h
> > @@ -321,7 +321,7 @@ int btrfs_qgroup_trace_extent_post(struct btrfs_trans_handle *trans,
> >    * (NULL trans)
> >    */
> >   int btrfs_qgroup_trace_extent(struct btrfs_trans_handle *trans, u64 bytenr,
> > -			      u64 num_bytes, gfp_t gfp_flag);
> > +			      u64 num_bytes);
> >   
> >   /*
> >    * Inform qgroup to trace all leaf items of data
> 
> 
> 
> > diff --git a/fs/btrfs/relocation.c b/fs/btrfs/relocation.c
> > index 216a4485d914..f5564aa313f5 100644
> > --- a/fs/btrfs/relocation.c
> > +++ b/fs/btrfs/relocation.c
> > @@ -471,7 +471,7 @@ static noinline_for_stack struct btrfs_backref_node *build_backref_tree(
> >   	int ret;
> >   	int err = 0;
> >   
> > -	iter = btrfs_backref_iter_alloc(rc->extent_root->fs_info, GFP_NOFS);
> > +	iter = btrfs_backref_iter_alloc(rc->extent_root->fs_info);
> >   	if (!iter)
> >   		return ERR_PTR(-ENOMEM);
> >   	path = btrfs_alloc_path();
> 
> 
>   This change should be part of the patch 1/4.
>   Except that, rest looks good.

Ah I see, that's what was Johannes complained about, I did not realize
that the change was split. I'll fix it.
diff mbox series

Patch

diff --git a/fs/btrfs/qgroup.c b/fs/btrfs/qgroup.c
index 9334c3157c22..34f0e4dabe25 100644
--- a/fs/btrfs/qgroup.c
+++ b/fs/btrfs/qgroup.c
@@ -1840,7 +1840,7 @@  int btrfs_qgroup_trace_extent_post(struct btrfs_trans_handle *trans,
 }
 
 int btrfs_qgroup_trace_extent(struct btrfs_trans_handle *trans, u64 bytenr,
-			      u64 num_bytes, gfp_t gfp_flag)
+			      u64 num_bytes)
 {
 	struct btrfs_fs_info *fs_info = trans->fs_info;
 	struct btrfs_qgroup_extent_record *record;
@@ -1850,7 +1850,7 @@  int btrfs_qgroup_trace_extent(struct btrfs_trans_handle *trans, u64 bytenr,
 	if (!test_bit(BTRFS_FS_QUOTA_ENABLED, &fs_info->flags)
 	    || bytenr == 0 || num_bytes == 0)
 		return 0;
-	record = kzalloc(sizeof(*record), gfp_flag);
+	record = kzalloc(sizeof(*record), GFP_NOFS);
 	if (!record)
 		return -ENOMEM;
 
@@ -1902,8 +1902,7 @@  int btrfs_qgroup_trace_leaf_items(struct btrfs_trans_handle *trans,
 
 		num_bytes = btrfs_file_extent_disk_num_bytes(eb, fi);
 
-		ret = btrfs_qgroup_trace_extent(trans, bytenr, num_bytes,
-						GFP_NOFS);
+		ret = btrfs_qgroup_trace_extent(trans, bytenr, num_bytes);
 		if (ret)
 			return ret;
 	}
@@ -2102,12 +2101,11 @@  static int qgroup_trace_extent_swap(struct btrfs_trans_handle* trans,
 	 * blocks for qgroup accounting.
 	 */
 	ret = btrfs_qgroup_trace_extent(trans, src_path->nodes[dst_level]->start,
-			nodesize, GFP_NOFS);
+					nodesize);
 	if (ret < 0)
 		goto out;
-	ret = btrfs_qgroup_trace_extent(trans,
-			dst_path->nodes[dst_level]->start,
-			nodesize, GFP_NOFS);
+	ret = btrfs_qgroup_trace_extent(trans, dst_path->nodes[dst_level]->start,
+					nodesize);
 	if (ret < 0)
 		goto out;
 
@@ -2391,8 +2389,7 @@  int btrfs_qgroup_trace_subtree(struct btrfs_trans_handle *trans,
 			path->locks[level] = BTRFS_READ_LOCK;
 
 			ret = btrfs_qgroup_trace_extent(trans, child_bytenr,
-							fs_info->nodesize,
-							GFP_NOFS);
+							fs_info->nodesize);
 			if (ret)
 				goto out;
 		}
diff --git a/fs/btrfs/qgroup.h b/fs/btrfs/qgroup.h
index 3fb5459c9309..7bffa10589d6 100644
--- a/fs/btrfs/qgroup.h
+++ b/fs/btrfs/qgroup.h
@@ -321,7 +321,7 @@  int btrfs_qgroup_trace_extent_post(struct btrfs_trans_handle *trans,
  * (NULL trans)
  */
 int btrfs_qgroup_trace_extent(struct btrfs_trans_handle *trans, u64 bytenr,
-			      u64 num_bytes, gfp_t gfp_flag);
+			      u64 num_bytes);
 
 /*
  * Inform qgroup to trace all leaf items of data
diff --git a/fs/btrfs/relocation.c b/fs/btrfs/relocation.c
index 216a4485d914..f5564aa313f5 100644
--- a/fs/btrfs/relocation.c
+++ b/fs/btrfs/relocation.c
@@ -471,7 +471,7 @@  static noinline_for_stack struct btrfs_backref_node *build_backref_tree(
 	int ret;
 	int err = 0;
 
-	iter = btrfs_backref_iter_alloc(rc->extent_root->fs_info, GFP_NOFS);
+	iter = btrfs_backref_iter_alloc(rc->extent_root->fs_info);
 	if (!iter)
 		return ERR_PTR(-ENOMEM);
 	path = btrfs_alloc_path();
diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c
index 813986e38258..3b44b325aba6 100644
--- a/fs/btrfs/tree-log.c
+++ b/fs/btrfs/tree-log.c
@@ -747,8 +747,7 @@  static noinline int replay_one_extent(struct btrfs_trans_handle *trans,
 		 */
 		ret = btrfs_qgroup_trace_extent(trans,
 				btrfs_file_extent_disk_bytenr(eb, item),
-				btrfs_file_extent_disk_num_bytes(eb, item),
-				GFP_NOFS);
+				btrfs_file_extent_disk_num_bytes(eb, item));
 		if (ret < 0)
 			goto out;