Message ID | 20181210070103.10073-1-wqu@suse.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | btrfs: extent-tree: cleanup one-shot usage of @blocksize in do_walk_down | expand |
On 10.12.18 г. 9:01 ч., Qu Wenruo wrote: > @blocksize variable in do_walk_down() is only used once, really no need > to declare it. > > Signed-off-by: Qu Wenruo <wqu@suse.com> Reviewed-by: Nikolay Borisov <nborisov@suse.com> > --- > fs/btrfs/extent-tree.c | 4 +--- > 1 file changed, 1 insertion(+), 3 deletions(-) > > diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c > index 225698b588c4..6744f2fa2b03 100644 > --- a/fs/btrfs/extent-tree.c > +++ b/fs/btrfs/extent-tree.c > @@ -8577,7 +8577,6 @@ static noinline int do_walk_down(struct btrfs_trans_handle *trans, > u64 bytenr; > u64 generation; > u64 parent; > - u32 blocksize; > struct btrfs_key key; > struct btrfs_key first_key; > struct extent_buffer *next; > @@ -8602,7 +8601,6 @@ static noinline int do_walk_down(struct btrfs_trans_handle *trans, > bytenr = btrfs_node_blockptr(path->nodes[level], path->slots[level]); > btrfs_node_key_to_cpu(path->nodes[level], &first_key, > path->slots[level]); > - blocksize = fs_info->nodesize; > > next = find_extent_buffer(fs_info, bytenr); > if (!next) { > @@ -8726,7 +8724,7 @@ static noinline int do_walk_down(struct btrfs_trans_handle *trans, > ret); > } > } > - ret = btrfs_free_extent(trans, root, bytenr, blocksize, > + ret = btrfs_free_extent(trans, root, bytenr, fs_info->nodesize, > parent, root->root_key.objectid, > level - 1, 0, false); > if (ret) >
Looks good,
Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de>
On Mon, Dec 10, 2018 at 03:01:03PM +0800, Qu Wenruo wrote: > @blocksize variable in do_walk_down() is only used once, really no need > to declare it. > > Signed-off-by: Qu Wenruo <wqu@suse.com> Added to misc-next, thanks.
diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c index 225698b588c4..6744f2fa2b03 100644 --- a/fs/btrfs/extent-tree.c +++ b/fs/btrfs/extent-tree.c @@ -8577,7 +8577,6 @@ static noinline int do_walk_down(struct btrfs_trans_handle *trans, u64 bytenr; u64 generation; u64 parent; - u32 blocksize; struct btrfs_key key; struct btrfs_key first_key; struct extent_buffer *next; @@ -8602,7 +8601,6 @@ static noinline int do_walk_down(struct btrfs_trans_handle *trans, bytenr = btrfs_node_blockptr(path->nodes[level], path->slots[level]); btrfs_node_key_to_cpu(path->nodes[level], &first_key, path->slots[level]); - blocksize = fs_info->nodesize; next = find_extent_buffer(fs_info, bytenr); if (!next) { @@ -8726,7 +8724,7 @@ static noinline int do_walk_down(struct btrfs_trans_handle *trans, ret); } } - ret = btrfs_free_extent(trans, root, bytenr, blocksize, + ret = btrfs_free_extent(trans, root, bytenr, fs_info->nodesize, parent, root->root_key.objectid, level - 1, 0, false); if (ret)
@blocksize variable in do_walk_down() is only used once, really no need to declare it. Signed-off-by: Qu Wenruo <wqu@suse.com> --- fs/btrfs/extent-tree.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)