| Message ID | 20181114133520.16069-6-jthumshirn@suse.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | btrfs: fix compiler warning with make W=1 | expand |
On Wed, Nov 14, 2018 at 02:35:19PM +0100, Johannes Thumshirn wrote: > Commit 2922040236f9 (btrfs: Remove extent_io_ops::writepage_end_io_hook) > removed the indirection to extent_io_ops::writepage_end_io_hook but didn't > remove the tree variable which then became unused. > > Remove 'tree' as well to silence the warning when -Wunused-but-set-variable > is used to compile btrfs. Reviewed-by: Omar Sandoval <osandov@fb.com> > Signed-off-by: Johannes Thumshirn <jthumshirn@suse.de> > --- > fs/btrfs/compression.c | 2 -- > 1 file changed, 2 deletions(-) > > diff --git a/fs/btrfs/compression.c b/fs/btrfs/compression.c > index bde8d0487bbb..088570c5dfb8 100644 > --- a/fs/btrfs/compression.c > +++ b/fs/btrfs/compression.c > @@ -229,7 +229,6 @@ static noinline void end_compressed_writeback(struct inode *inode, > */ > static void end_compressed_bio_write(struct bio *bio) > { > - struct extent_io_tree *tree; > struct compressed_bio *cb = bio->bi_private; > struct inode *inode; > struct page *page; > @@ -248,7 +247,6 @@ static void end_compressed_bio_write(struct bio *bio) > * call back into the FS and do all the end_io operations > */ > inode = cb->inode; > - tree = &BTRFS_I(inode)->io_tree; > cb->compressed_pages[0]->mapping = cb->inode->i_mapping; > btrfs_writepage_endio_finish_ordered(cb->compressed_pages[0], > cb->start, cb->start + cb->len - 1, NULL, > -- > 2.16.4 >
On Wed, Nov 14, 2018 at 02:35:19PM +0100, Johannes Thumshirn wrote: > Commit 2922040236f9 (btrfs: Remove extent_io_ops::writepage_end_io_hook) > removed the indirection to extent_io_ops::writepage_end_io_hook but didn't > remove the tree variable which then became unused. > > Remove 'tree' as well to silence the warning when -Wunused-but-set-variable > is used to compile btrfs. > > Signed-off-by: Johannes Thumshirn <jthumshirn@suse.de> > --- > fs/btrfs/compression.c | 2 -- > 1 file changed, 2 deletions(-) > > diff --git a/fs/btrfs/compression.c b/fs/btrfs/compression.c > index bde8d0487bbb..088570c5dfb8 100644 > --- a/fs/btrfs/compression.c > +++ b/fs/btrfs/compression.c > @@ -229,7 +229,6 @@ static noinline void end_compressed_writeback(struct inode *inode, > */ > static void end_compressed_bio_write(struct bio *bio) > { > - struct extent_io_tree *tree; > struct compressed_bio *cb = bio->bi_private; > struct inode *inode; > struct page *page; > @@ -248,7 +247,6 @@ static void end_compressed_bio_write(struct bio *bio) > * call back into the FS and do all the end_io operations > */ > inode = cb->inode; > - tree = &BTRFS_I(inode)->io_tree; The fix has been folded to the original patch already, same the other one removing 'tree'. If you used linux-next to run the build, then it's probably lagging behind the development branches that are synced to kernel.org after some testing. The devel repos are either git://github.com/kdave/btrfs-devel or git://gitlab.com/kdave/btrfs-devel, branch misc-next.
On 14/11/2018 22:04, David Sterba wrote: > The fix has been folded to the original patch already, same the other > one removing 'tree'. If you used linux-next to run the build, then it's > probably lagging behind the development branches that are synced to > kernel.org after some testing. The devel repos are either > git://github.com/kdave/btrfs-devel or > git://gitlab.com/kdave/btrfs-devel, branch misc-next. Ah OK, I've used your kernel.org btrfs/for-next, I'll rebase for v2.
diff --git a/fs/btrfs/compression.c b/fs/btrfs/compression.c index bde8d0487bbb..088570c5dfb8 100644 --- a/fs/btrfs/compression.c +++ b/fs/btrfs/compression.c @@ -229,7 +229,6 @@ static noinline void end_compressed_writeback(struct inode *inode, */ static void end_compressed_bio_write(struct bio *bio) { - struct extent_io_tree *tree; struct compressed_bio *cb = bio->bi_private; struct inode *inode; struct page *page; @@ -248,7 +247,6 @@ static void end_compressed_bio_write(struct bio *bio) * call back into the FS and do all the end_io operations */ inode = cb->inode; - tree = &BTRFS_I(inode)->io_tree; cb->compressed_pages[0]->mapping = cb->inode->i_mapping; btrfs_writepage_endio_finish_ordered(cb->compressed_pages[0], cb->start, cb->start + cb->len - 1, NULL,
Commit 2922040236f9 (btrfs: Remove extent_io_ops::writepage_end_io_hook) removed the indirection to extent_io_ops::writepage_end_io_hook but didn't remove the tree variable which then became unused. Remove 'tree' as well to silence the warning when -Wunused-but-set-variable is used to compile btrfs. Signed-off-by: Johannes Thumshirn <jthumshirn@suse.de> --- fs/btrfs/compression.c | 2 -- 1 file changed, 2 deletions(-)