| Message ID | 20190418064356.10418-1-yuehaibing@huawei.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [-next] btrfs: Remove set but not used variable 'fs_info' | expand |
On 18.04.19 г. 9:43 ч., YueHaibing wrote: > Fixes gcc '-Wunused-but-set-variable' warning: > > fs/btrfs/free-space-tree.c: In function 'load_free_space_tree': > fs/btrfs/free-space-tree.c:1535:24: warning: > variable 'fs_info' set but not used [-Wunused-but-set-variable] > > It's not used since commit 05e9d3137d47 ("btrfs: get fs_info from block group > in search_free_space_info"), so can be removed. > > Signed-off-by: YueHaibing <yuehaibing@huawei.com> > --- > fs/btrfs/free-space-tree.c | 2 -- > 1 file changed, 2 deletions(-) > > diff --git a/fs/btrfs/free-space-tree.c b/fs/btrfs/free-space-tree.c > index cfe9dfb0ff05..f5dc115ebba0 100644 > --- a/fs/btrfs/free-space-tree.c > +++ b/fs/btrfs/free-space-tree.c > @@ -1532,14 +1532,12 @@ static int load_free_space_extents(struct btrfs_caching_control *caching_ctl, > int load_free_space_tree(struct btrfs_caching_control *caching_ctl) > { > struct btrfs_block_group_cache *block_group; > - struct btrfs_fs_info *fs_info; > struct btrfs_free_space_info *info; > struct btrfs_path *path; > u32 extent_count, flags; > int ret; > > block_group = caching_ctl->block_group; > - fs_info = block_group->fs_info; What version is this patch based on? In current misc-next ( on which new patches ought to be based and can be found at: currently has: fs_info = block_group->fs_info; root = fs_info->free_space_root; ...... if (extent_count != expected_extent_count) { btrfs_err(fs_info, "incorrect extent count for %llu; counted %u, expected %u", block_group->key.objectid, extent_count, expected_extent_count); In short: nack > > path = btrfs_alloc_path(); > if (!path) > > > >
On 2019/4/18 14:37, Nikolay Borisov wrote: > > > On 18.04.19 г. 9:43 ч., YueHaibing wrote: >> Fixes gcc '-Wunused-but-set-variable' warning: >> >> fs/btrfs/free-space-tree.c: In function 'load_free_space_tree': >> fs/btrfs/free-space-tree.c:1535:24: warning: >> variable 'fs_info' set but not used [-Wunused-but-set-variable] >> >> It's not used since commit 05e9d3137d47 ("btrfs: get fs_info from block group >> in search_free_space_info"), so can be removed. >> >> Signed-off-by: YueHaibing <yuehaibing@huawei.com> >> --- >> fs/btrfs/free-space-tree.c | 2 -- >> 1 file changed, 2 deletions(-) >> >> diff --git a/fs/btrfs/free-space-tree.c b/fs/btrfs/free-space-tree.c >> index cfe9dfb0ff05..f5dc115ebba0 100644 >> --- a/fs/btrfs/free-space-tree.c >> +++ b/fs/btrfs/free-space-tree.c >> @@ -1532,14 +1532,12 @@ static int load_free_space_extents(struct btrfs_caching_control *caching_ctl, >> int load_free_space_tree(struct btrfs_caching_control *caching_ctl) >> { >> struct btrfs_block_group_cache *block_group; >> - struct btrfs_fs_info *fs_info; >> struct btrfs_free_space_info *info; >> struct btrfs_path *path; >> u32 extent_count, flags; >> int ret; >> >> block_group = caching_ctl->block_group; >> - fs_info = block_group->fs_info; > > What version is this patch based on? In current misc-next ( on which new > patches ought to be based and can be found at: currently has: This patch based on linux-next tree: https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/commit/?id=05e9d3137d47 > > fs_info = block_group->fs_info; > root = fs_info->free_space_root; > > ...... > > if (extent_count != expected_extent_count) { > btrfs_err(fs_info, > > "incorrect extent count for %llu; counted > %u, expected %u", > block_group->key.objectid, extent_count, > > expected_extent_count); > > In short: nack > >> >> path = btrfs_alloc_path(); >> if (!path) >> >> >> >> > >
On Thu, Apr 18, 2019 at 06:43:56AM +0000, YueHaibing wrote: > Fixes gcc '-Wunused-but-set-variable' warning: > > fs/btrfs/free-space-tree.c: In function 'load_free_space_tree': > fs/btrfs/free-space-tree.c:1535:24: warning: > variable 'fs_info' set but not used [-Wunused-but-set-variable] > > It's not used since commit 05e9d3137d47 ("btrfs: get fs_info from block group > in search_free_space_info"), so can be removed. Thanks, as this is in a development branch I'll fold the change to the patch that introduced it.
diff --git a/fs/btrfs/free-space-tree.c b/fs/btrfs/free-space-tree.c index cfe9dfb0ff05..f5dc115ebba0 100644 --- a/fs/btrfs/free-space-tree.c +++ b/fs/btrfs/free-space-tree.c @@ -1532,14 +1532,12 @@ static int load_free_space_extents(struct btrfs_caching_control *caching_ctl, int load_free_space_tree(struct btrfs_caching_control *caching_ctl) { struct btrfs_block_group_cache *block_group; - struct btrfs_fs_info *fs_info; struct btrfs_free_space_info *info; struct btrfs_path *path; u32 extent_count, flags; int ret; block_group = caching_ctl->block_group; - fs_info = block_group->fs_info; path = btrfs_alloc_path(); if (!path)
Fixes gcc '-Wunused-but-set-variable' warning: fs/btrfs/free-space-tree.c: In function 'load_free_space_tree': fs/btrfs/free-space-tree.c:1535:24: warning: variable 'fs_info' set but not used [-Wunused-but-set-variable] It's not used since commit 05e9d3137d47 ("btrfs: get fs_info from block group in search_free_space_info"), so can be removed. Signed-off-by: YueHaibing <yuehaibing@huawei.com> --- fs/btrfs/free-space-tree.c | 2 -- 1 file changed, 2 deletions(-)