[PATCH] nbd: Drop dead code spotted by Coverity

[PATCH] nbd: Drop dead code spotted by Coverity

[Eric Blake]

CID 1488362 points out that the second 'rc >= 0' check is now dead
code.

Reported-by: Peter Maydell <peter.maydell@linaro.org>
Fixes: 172f5f1a40(nbd: remove peppering of nbd_client_connected)
Signed-off-by: Eric Blake <eblake@redhat.com>
---
 block/nbd.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/block/nbd.c b/block/nbd.c
index 6085ab1d2c..7f5f50ec46 100644
--- a/block/nbd.c
+++ b/block/nbd.c
@@ -521,12 +521,8 @@ static int coroutine_fn nbd_co_send_request(BlockDriverState *bs,
     if (qiov) {
         qio_channel_set_cork(s->ioc, true);
         rc = nbd_send_request(s->ioc, request);
-        if (rc >= 0) {
-            if (qio_channel_writev_all(s->ioc, qiov->iov, qiov->niov,
-                                       NULL) < 0) {
-                rc = -EIO;
-            }
-        } else if (rc >= 0) {
+        if (rc >= 0 && qio_channel_writev_all(s->ioc, qiov->iov, qiov->niov,
+                                              NULL) < 0) {
             rc = -EIO;
         }
         qio_channel_set_cork(s->ioc, false);
-- 
2.36.1

Re: [PATCH] nbd: Drop dead code spotted by Coverity

[Peter Maydell]

On Mon, 16 May 2022 at 22:05, Eric Blake <eblake@redhat.com> wrote:
>
> CID 1488362 points out that the second 'rc >= 0' check is now dead
> code.
>
> Reported-by: Peter Maydell <peter.maydell@linaro.org>
> Fixes: 172f5f1a40(nbd: remove peppering of nbd_client_connected)
> Signed-off-by: Eric Blake <eblake@redhat.com>
> ---
>  block/nbd.c | 8 ++------
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>

thanks
-- PMM

Re: [PATCH] nbd: Drop dead code spotted by Coverity

[Vladimir Sementsov-Ogievskiy]

17.05.2022 00:05, Eric Blake wrote:
> CID 1488362 points out that the second 'rc >= 0' check is now dead
> code.
> 
> Reported-by: Peter Maydell <peter.maydell@linaro.org>
> Fixes: 172f5f1a40(nbd: remove peppering of nbd_client_connected)
> Signed-off-by: Eric Blake <eblake@redhat.com>
> ---
>   block/nbd.c | 8 ++------
>   1 file changed, 2 insertions(+), 6 deletions(-)
> 
> diff --git a/block/nbd.c b/block/nbd.c
> index 6085ab1d2c..7f5f50ec46 100644
> --- a/block/nbd.c
> +++ b/block/nbd.c
> @@ -521,12 +521,8 @@ static int coroutine_fn nbd_co_send_request(BlockDriverState *bs,
>       if (qiov) {
>           qio_channel_set_cork(s->ioc, true);
>           rc = nbd_send_request(s->ioc, request);
> -        if (rc >= 0) {
> -            if (qio_channel_writev_all(s->ioc, qiov->iov, qiov->niov,
> -                                       NULL) < 0) {
> -                rc = -EIO;
> -            }
> -        } else if (rc >= 0) {
> +        if (rc >= 0 && qio_channel_writev_all(s->ioc, qiov->iov, qiov->niov,
> +                                              NULL) < 0) {
>               rc = -EIO;
>           }
>           qio_channel_set_cork(s->ioc, false);


Hi all! I am back). And happy to start with something simple:

Reviewed-by: Vladimir Sementsov-Ogievskiy <v.sementsov-og@mail.ru>

(yes, not @openvz.org, just my personal address. Probably new employer will ask to use a corporate one, if so I'll have to send one another patch to MAINTAINERS. But I'd prefer not to hurry with it.)

Sorry for a long delay. That was a gap between old place of work and a new one. I have planned to do some review and resending work in the list during the gap, but.. There were so many things)
Anyway, now at new work I've given some time to continue Qemu maintenance and working on my unfinished series and that's wonderful.

-- 
Best regards,
Vladimir

Re: [PATCH] nbd: Drop dead code spotted by Coverity

[Kevin Wolf]

Am 16.05.2022 um 23:05 hat Eric Blake geschrieben:
> CID 1488362 points out that the second 'rc >= 0' check is now dead
> code.
> 
> Reported-by: Peter Maydell <peter.maydell@linaro.org>
> Fixes: 172f5f1a40(nbd: remove peppering of nbd_client_connected)
> Signed-off-by: Eric Blake <eblake@redhat.com>

Thanks, applied to the block branch.

Kevin