diff mbox

[v2,7/7] btrfs-progs: Cleanup use of root in leaf_data_end

Message ID 1516951566-21777-8-git-send-email-gujx@cn.fujitsu.com (mailing list archive)
State New, archived
Headers show

Commit Message

Gu Jinxiang Jan. 26, 2018, 7:26 a.m. UTC 
In function leaf_data_end, root is just used to get fs_info,
so change the parameter of this function from btrfs_root to
btrfs_fs_info.
And also make it consistent with kernel.

Signed-off-by: Gu Jinxiang <gujx@cn.fujitsu.com>
---
 ctree.c | 32 +++++++++++++++++---------------
 1 file changed, 17 insertions(+), 15 deletions(-)

Comments

Qu Wenruo Jan. 30, 2018, 7:36 a.m. UTC | #1 
On 2018年01月26日 15:26, Gu Jinxiang wrote:
> In function leaf_data_end, root is just used to get fs_info,
> so change the parameter of this function from btrfs_root to
> btrfs_fs_info.
> And also make it consistent with kernel.
> 
> Signed-off-by: Gu Jinxiang <gujx@cn.fujitsu.com>
> ---
>  ctree.c | 32 +++++++++++++++++---------------
>  1 file changed, 17 insertions(+), 15 deletions(-)
> 
> diff --git a/ctree.c b/ctree.c
> index 11d207e7..2417483d 100644
> --- a/ctree.c
> +++ b/ctree.c
> @@ -410,12 +410,12 @@ static int btrfs_comp_keys(struct btrfs_disk_key *disk, struct btrfs_key *k2)
>   * this returns the address of the start of the last item,
>   * which is the stop of the leaf data stack
>   */
> -static inline unsigned int leaf_data_end(struct btrfs_root *root,
> -					 struct extent_buffer *leaf)
> +static inline unsigned int leaf_data_end(const struct btrfs_fs_info *fs_info,
> +					 const struct extent_buffer *leaf)

Here leaf is const, which is fine.

>  {
>  	u32 nr = btrfs_header_nritems(leaf);
>  	if (nr == 0)
> -		return BTRFS_LEAF_DATA_SIZE(root->fs_info);
> +		return BTRFS_LEAF_DATA_SIZE(fs_info);
>  	return btrfs_item_offset_nr(leaf, nr - 1);

But btrfs_item_offset_nr() doesn't have const prefix for leaf.
Leaving the following warning:

passing argument 1 of ‘btrfs_item_offset_nr’ discards ‘const’ qualifier
from pointer target type [-Wdiscarded-qualifiers]
  return btrfs_item_offset_nr(leaf, nr - 1);
                              ^~~~

Thanks,
Qu
>  }
>  
> @@ -1737,10 +1737,10 @@ static int push_leaf_right(struct btrfs_trans_handle *trans, struct btrfs_root
>  	right_nritems = btrfs_header_nritems(right);
>  
>  	push_space = btrfs_item_end_nr(left, left_nritems - push_items);
> -	push_space -= leaf_data_end(root, left);
> +	push_space -= leaf_data_end(fs_info, left);
>  
>  	/* make room in the right data area */
> -	data_end = leaf_data_end(root, right);
> +	data_end = leaf_data_end(fs_info, right);
>  	memmove_extent_buffer(right,
>  			      btrfs_leaf_data(right) + data_end - push_space,
>  			      btrfs_leaf_data(right) + data_end,
> @@ -1749,7 +1749,7 @@ static int push_leaf_right(struct btrfs_trans_handle *trans, struct btrfs_root
>  	/* copy from the left data area */
>  	copy_extent_buffer(right, left, btrfs_leaf_data(right) +
>  		     BTRFS_LEAF_DATA_SIZE(root->fs_info) - push_space,
> -		     btrfs_leaf_data(left) + leaf_data_end(root, left),
> +		     btrfs_leaf_data(left) + leaf_data_end(fs_info, left),
>  		     push_space);
>  
>  	memmove_extent_buffer(right, btrfs_item_nr_offset(push_items),
> @@ -1887,7 +1887,7 @@ static int push_leaf_left(struct btrfs_trans_handle *trans, struct btrfs_root
>  		     btrfs_item_offset_nr(right, push_items -1);
>  
>  	copy_extent_buffer(left, right, btrfs_leaf_data(left) +
> -		     leaf_data_end(root, left) - push_space,
> +		     leaf_data_end(fs_info, left) - push_space,
>  		     btrfs_leaf_data(right) +
>  		     btrfs_item_offset_nr(right, push_items - 1),
>  		     push_space);
> @@ -1914,12 +1914,13 @@ static int push_leaf_left(struct btrfs_trans_handle *trans, struct btrfs_root
>  
>  	if (push_items < right_nritems) {
>  		push_space = btrfs_item_offset_nr(right, push_items - 1) -
> -						  leaf_data_end(root, right);
> +						  leaf_data_end(fs_info, right);
>  		memmove_extent_buffer(right, btrfs_leaf_data(right) +
>  				      BTRFS_LEAF_DATA_SIZE(root->fs_info) -
>  				      push_space,
>  				      btrfs_leaf_data(right) +
> -				      leaf_data_end(root, right), push_space);
> +				      leaf_data_end(fs_info, right),
> +				      push_space);
>  
>  		memmove_extent_buffer(right, btrfs_item_nr_offset(0),
>  			      btrfs_item_nr_offset(push_items),
> @@ -1978,7 +1979,8 @@ static noinline int copy_for_split(struct btrfs_trans_handle *trans,
>  
>  	nritems = nritems - mid;
>  	btrfs_set_header_nritems(right, nritems);
> -	data_copy_size = btrfs_item_end_nr(l, mid) - leaf_data_end(root, l);
> +	data_copy_size = btrfs_item_end_nr(l, mid) -
> +		leaf_data_end(root->fs_info, l);
>  
>  	copy_extent_buffer(right, l, btrfs_item_nr_offset(0),
>  			   btrfs_item_nr_offset(mid),
> @@ -1988,7 +1990,7 @@ static noinline int copy_for_split(struct btrfs_trans_handle *trans,
>  		     btrfs_leaf_data(right) +
>  		     BTRFS_LEAF_DATA_SIZE(root->fs_info) -
>  		     data_copy_size, btrfs_leaf_data(l) +
> -		     leaf_data_end(root, l), data_copy_size);
> +		     leaf_data_end(root->fs_info, l), data_copy_size);
>  
>  	rt_data_off = BTRFS_LEAF_DATA_SIZE(root->fs_info) -
>  		      btrfs_item_end_nr(l, mid);
> @@ -2326,7 +2328,7 @@ int btrfs_truncate_item(struct btrfs_root *root, struct btrfs_path *path,
>  		return 0;
>  
>  	nritems = btrfs_header_nritems(leaf);
> -	data_end = leaf_data_end(root, leaf);
> +	data_end = leaf_data_end(root->fs_info, leaf);
>  
>  	old_data_start = btrfs_item_offset_nr(leaf, slot);
>  
> @@ -2415,7 +2417,7 @@ int btrfs_extend_item(struct btrfs_root *root, struct btrfs_path *path,
>  	leaf = path->nodes[0];
>  
>  	nritems = btrfs_header_nritems(leaf);
> -	data_end = leaf_data_end(root, leaf);
> +	data_end = leaf_data_end(root->fs_info, leaf);
>  
>  	if (btrfs_leaf_free_space(root, leaf) < data_size) {
>  		btrfs_print_leaf(root, leaf);
> @@ -2501,7 +2503,7 @@ int btrfs_insert_empty_items(struct btrfs_trans_handle *trans,
>  	leaf = path->nodes[0];
>  
>  	nritems = btrfs_header_nritems(leaf);
> -	data_end = leaf_data_end(root, leaf);
> +	data_end = leaf_data_end(root->fs_info, leaf);
>  
>  	if (btrfs_leaf_free_space(root, leaf) < total_size) {
>  		btrfs_print_leaf(root, leaf);
> @@ -2692,7 +2694,7 @@ int btrfs_del_items(struct btrfs_trans_handle *trans, struct btrfs_root *root,
>  	nritems = btrfs_header_nritems(leaf);
>  
>  	if (slot + nr != nritems) {
> -		int data_end = leaf_data_end(root, leaf);
> +		int data_end = leaf_data_end(root->fs_info, leaf);
>  
>  		memmove_extent_buffer(leaf, btrfs_leaf_data(leaf) +
>  			      data_end + dsize,
>
David Sterba Jan. 31, 2018, 4:12 p.m. UTC | #2 
On Tue, Jan 30, 2018 at 03:36:28PM +0800, Qu Wenruo wrote:
> On 2018年01月26日 15:26, Gu Jinxiang wrote:
> > In function leaf_data_end, root is just used to get fs_info,
> > so change the parameter of this function from btrfs_root to
> > btrfs_fs_info.
> > And also make it consistent with kernel.
> > 
> > Signed-off-by: Gu Jinxiang <gujx@cn.fujitsu.com>
> > ---
> >  ctree.c | 32 +++++++++++++++++---------------
> >  1 file changed, 17 insertions(+), 15 deletions(-)
> > 
> > diff --git a/ctree.c b/ctree.c
> > index 11d207e7..2417483d 100644
> > --- a/ctree.c
> > +++ b/ctree.c
> > @@ -410,12 +410,12 @@ static int btrfs_comp_keys(struct btrfs_disk_key *disk, struct btrfs_key *k2)
> >   * this returns the address of the start of the last item,
> >   * which is the stop of the leaf data stack
> >   */
> > -static inline unsigned int leaf_data_end(struct btrfs_root *root,
> > -					 struct extent_buffer *leaf)
> > +static inline unsigned int leaf_data_end(const struct btrfs_fs_info *fs_info,
> > +					 const struct extent_buffer *leaf)
> 
> Here leaf is const, which is fine.
> 
> >  {
> >  	u32 nr = btrfs_header_nritems(leaf);
> >  	if (nr == 0)
> > -		return BTRFS_LEAF_DATA_SIZE(root->fs_info);
> > +		return BTRFS_LEAF_DATA_SIZE(fs_info);
> >  	return btrfs_item_offset_nr(leaf, nr - 1);
> 
> But btrfs_item_offset_nr() doesn't have const prefix for leaf.
> Leaving the following warning:
> 
> passing argument 1 of ‘btrfs_item_offset_nr’ discards ‘const’ qualifier
> from pointer target type [-Wdiscarded-qualifiers]
>   return btrfs_item_offset_nr(leaf, nr - 1);
>                               ^~~~

I don't want to add the warning, so I'll skip this patch for now. The
constification of arguments will likely propagate to more helpers so
it's not a trivial fix to this patch.

Gu Jinxiang, please fix the warning and resend with possibly more
preparatory cleanups if necessary. Thanks.
--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/ctree.c b/ctree.c
index 11d207e7..2417483d 100644
--- a/ctree.c
+++ b/ctree.c
@@ -410,12 +410,12 @@  static int btrfs_comp_keys(struct btrfs_disk_key *disk, struct btrfs_key *k2)
  * this returns the address of the start of the last item,
  * which is the stop of the leaf data stack
  */
-static inline unsigned int leaf_data_end(struct btrfs_root *root,
-					 struct extent_buffer *leaf)
+static inline unsigned int leaf_data_end(const struct btrfs_fs_info *fs_info,
+					 const struct extent_buffer *leaf)
 {
 	u32 nr = btrfs_header_nritems(leaf);
 	if (nr == 0)
-		return BTRFS_LEAF_DATA_SIZE(root->fs_info);
+		return BTRFS_LEAF_DATA_SIZE(fs_info);
 	return btrfs_item_offset_nr(leaf, nr - 1);
 }
 
@@ -1737,10 +1737,10 @@  static int push_leaf_right(struct btrfs_trans_handle *trans, struct btrfs_root
 	right_nritems = btrfs_header_nritems(right);
 
 	push_space = btrfs_item_end_nr(left, left_nritems - push_items);
-	push_space -= leaf_data_end(root, left);
+	push_space -= leaf_data_end(fs_info, left);
 
 	/* make room in the right data area */
-	data_end = leaf_data_end(root, right);
+	data_end = leaf_data_end(fs_info, right);
 	memmove_extent_buffer(right,
 			      btrfs_leaf_data(right) + data_end - push_space,
 			      btrfs_leaf_data(right) + data_end,
@@ -1749,7 +1749,7 @@  static int push_leaf_right(struct btrfs_trans_handle *trans, struct btrfs_root
 	/* copy from the left data area */
 	copy_extent_buffer(right, left, btrfs_leaf_data(right) +
 		     BTRFS_LEAF_DATA_SIZE(root->fs_info) - push_space,
-		     btrfs_leaf_data(left) + leaf_data_end(root, left),
+		     btrfs_leaf_data(left) + leaf_data_end(fs_info, left),
 		     push_space);
 
 	memmove_extent_buffer(right, btrfs_item_nr_offset(push_items),
@@ -1887,7 +1887,7 @@  static int push_leaf_left(struct btrfs_trans_handle *trans, struct btrfs_root
 		     btrfs_item_offset_nr(right, push_items -1);
 
 	copy_extent_buffer(left, right, btrfs_leaf_data(left) +
-		     leaf_data_end(root, left) - push_space,
+		     leaf_data_end(fs_info, left) - push_space,
 		     btrfs_leaf_data(right) +
 		     btrfs_item_offset_nr(right, push_items - 1),
 		     push_space);
@@ -1914,12 +1914,13 @@  static int push_leaf_left(struct btrfs_trans_handle *trans, struct btrfs_root
 
 	if (push_items < right_nritems) {
 		push_space = btrfs_item_offset_nr(right, push_items - 1) -
-						  leaf_data_end(root, right);
+						  leaf_data_end(fs_info, right);
 		memmove_extent_buffer(right, btrfs_leaf_data(right) +
 				      BTRFS_LEAF_DATA_SIZE(root->fs_info) -
 				      push_space,
 				      btrfs_leaf_data(right) +
-				      leaf_data_end(root, right), push_space);
+				      leaf_data_end(fs_info, right),
+				      push_space);
 
 		memmove_extent_buffer(right, btrfs_item_nr_offset(0),
 			      btrfs_item_nr_offset(push_items),
@@ -1978,7 +1979,8 @@  static noinline int copy_for_split(struct btrfs_trans_handle *trans,
 
 	nritems = nritems - mid;
 	btrfs_set_header_nritems(right, nritems);
-	data_copy_size = btrfs_item_end_nr(l, mid) - leaf_data_end(root, l);
+	data_copy_size = btrfs_item_end_nr(l, mid) -
+		leaf_data_end(root->fs_info, l);
 
 	copy_extent_buffer(right, l, btrfs_item_nr_offset(0),
 			   btrfs_item_nr_offset(mid),
@@ -1988,7 +1990,7 @@  static noinline int copy_for_split(struct btrfs_trans_handle *trans,
 		     btrfs_leaf_data(right) +
 		     BTRFS_LEAF_DATA_SIZE(root->fs_info) -
 		     data_copy_size, btrfs_leaf_data(l) +
-		     leaf_data_end(root, l), data_copy_size);
+		     leaf_data_end(root->fs_info, l), data_copy_size);
 
 	rt_data_off = BTRFS_LEAF_DATA_SIZE(root->fs_info) -
 		      btrfs_item_end_nr(l, mid);
@@ -2326,7 +2328,7 @@  int btrfs_truncate_item(struct btrfs_root *root, struct btrfs_path *path,
 		return 0;
 
 	nritems = btrfs_header_nritems(leaf);
-	data_end = leaf_data_end(root, leaf);
+	data_end = leaf_data_end(root->fs_info, leaf);
 
 	old_data_start = btrfs_item_offset_nr(leaf, slot);
 
@@ -2415,7 +2417,7 @@  int btrfs_extend_item(struct btrfs_root *root, struct btrfs_path *path,
 	leaf = path->nodes[0];
 
 	nritems = btrfs_header_nritems(leaf);
-	data_end = leaf_data_end(root, leaf);
+	data_end = leaf_data_end(root->fs_info, leaf);
 
 	if (btrfs_leaf_free_space(root, leaf) < data_size) {
 		btrfs_print_leaf(root, leaf);
@@ -2501,7 +2503,7 @@  int btrfs_insert_empty_items(struct btrfs_trans_handle *trans,
 	leaf = path->nodes[0];
 
 	nritems = btrfs_header_nritems(leaf);
-	data_end = leaf_data_end(root, leaf);
+	data_end = leaf_data_end(root->fs_info, leaf);
 
 	if (btrfs_leaf_free_space(root, leaf) < total_size) {
 		btrfs_print_leaf(root, leaf);
@@ -2692,7 +2694,7 @@  int btrfs_del_items(struct btrfs_trans_handle *trans, struct btrfs_root *root,
 	nritems = btrfs_header_nritems(leaf);
 
 	if (slot + nr != nritems) {
-		int data_end = leaf_data_end(root, leaf);
+		int data_end = leaf_data_end(root->fs_info, leaf);
 
 		memmove_extent_buffer(leaf, btrfs_leaf_data(leaf) +
 			      data_end + dsize,