Virtualization - Feb 2020 - [PATCH] virtio_balloon: Adjust label in virtballoon_probe

Clang warns when CONFIG_BALLOON_COMPACTION is unset:

../drivers/virtio/virtio_balloon.c:963:1: warning: unused label
'out_del_vqs' [-Wunused-label]
out_del_vqs:
^~~~~~~~~~~~
1 warning generated.

Move the label within the preprocessor block since it is only used when
CONFIG_BALLOON_COMPACTION is set.

Fixes: 1ad6f58ea936 ("virtio_balloon: Fix memory leaks on errors in
virtballoon_probe()")
Link: https://github.com/ClangBuiltLinux/linux/issues/886
Signed-off-by: Nathan Chancellor <natechancellor at gmail.com>
---
 drivers/virtio/virtio_balloon.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/virtio/virtio_balloon.c b/drivers/virtio/virtio_balloon.c
index 7bfe365d9372..341458fd95ca 100644
--- a/drivers/virtio/virtio_balloon.c
+++ b/drivers/virtio/virtio_balloon.c
@@ -959,8 +959,8 @@ static int virtballoon_probe(struct virtio_device *vdev)
 	iput(vb->vb_dev_info.inode);
 out_kern_unmount:
 	kern_unmount(balloon_mnt);
-#endif
 out_del_vqs:
+#endif
 	vdev->config->del_vqs(vdev);
 out_free_vb:
 	kfree(vb);
-- 
2.25.0

> Am 16.02.2020 um 01:41 schrieb Nathan Chancellor <natechancellor at
gmail.com>:
> 
> ?Clang warns when CONFIG_BALLOON_COMPACTION is unset:
> 
> ../drivers/virtio/virtio_balloon.c:963:1: warning: unused label
> 'out_del_vqs' [-Wunused-label]
> out_del_vqs:
> ^~~~~~~~~~~~
> 1 warning generated.
> 
Thanks, there is already ? [PATCH] virtio_balloon: Fix unused label warning?
from Boris on the list.

Cheers!

On Sun, Feb 16, 2020 at 08:36:45AM +0100, David Hildenbrand
wrote:
> 
> 
> > Am 16.02.2020 um 01:41 schrieb Nathan Chancellor <natechancellor at
gmail.com>:
> > 
> > ?Clang warns when CONFIG_BALLOON_COMPACTION is unset:
> > 
> > ../drivers/virtio/virtio_balloon.c:963:1: warning: unused label
> > 'out_del_vqs' [-Wunused-label]
> > out_del_vqs:
> > ^~~~~~~~~~~~
> > 1 warning generated.
> > 
> 
> Thanks, there is already ? [PATCH] virtio_balloon: Fix unused label
warning? from Boris on the list.
> 
> Cheers!
> 
Sorry for the noise, I thought I did a search for duplicate patches but
seems I missed it :/ I've commented on that patch.

Cheers,
Nathan

On 16.02.20 01:40, Nathan Chancellor wrote:
> Clang warns when CONFIG_BALLOON_COMPACTION is unset:
> 
> ../drivers/virtio/virtio_balloon.c:963:1: warning: unused label
> 'out_del_vqs' [-Wunused-label]
> out_del_vqs:
> ^~~~~~~~~~~~
> 1 warning generated.
> 
> Move the label within the preprocessor block since it is only used when
> CONFIG_BALLOON_COMPACTION is set.
> 
> Fixes: 1ad6f58ea936 ("virtio_balloon: Fix memory leaks on errors in
virtballoon_probe()")
> Link: https://github.com/ClangBuiltLinux/linux/issues/886
> Signed-off-by: Nathan Chancellor <natechancellor at gmail.com>
> ---
>  drivers/virtio/virtio_balloon.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/virtio/virtio_balloon.c
b/drivers/virtio/virtio_balloon.c
> index 7bfe365d9372..341458fd95ca 100644
> --- a/drivers/virtio/virtio_balloon.c
> +++ b/drivers/virtio/virtio_balloon.c
> @@ -959,8 +959,8 @@ static int virtballoon_probe(struct virtio_device
*vdev)
>  	iput(vb->vb_dev_info.inode);
>  out_kern_unmount:
>  	kern_unmount(balloon_mnt);
> -#endif
>  out_del_vqs:
> +#endif
>  	vdev->config->del_vqs(vdev);
>  out_free_vb:
>  	kfree(vb);
> 
Reviewed-by: David Hildenbrand <david at redhat.com>

-- 
Thanks,

David / dhildenb