diff mbox series

[v3,3/3] block/nbd-client: nbd_co_send_request: fix return code

Message ID 20170920124507.18841-4-vsementsov@virtuozzo.com
State New
Headers show
Series nbd client refactoring and fixing | expand

Commit Message

Vladimir Sementsov-Ogievskiy Sept. 20, 2017, 12:45 p.m. UTC 
It's incorrect to return success rc >= 0 if we skip qio_channel_writev_all()
call due to s->quit.

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
---
 block/nbd-client.c | 2 ++
 1 file changed, 2 insertions(+)

Comments

Eric Blake Sept. 20, 2017, 3:41 p.m. UTC | #1 
On 09/20/2017 07:45 AM, Vladimir Sementsov-Ogievskiy wrote:
> It's incorrect to return success rc >= 0 if we skip qio_channel_writev_all()
> call due to s->quit.
> 
> Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
> ---
>  block/nbd-client.c | 2 ++
>  1 file changed, 2 insertions(+)

Reviewed-by: Eric Blake <eblake@redhat.com>

> 
> diff --git a/block/nbd-client.c b/block/nbd-client.c
> index 486bfff9f7..9d1e154feb 100644
> --- a/block/nbd-client.c
> +++ b/block/nbd-client.c
> @@ -161,6 +161,8 @@ static int nbd_co_send_request(BlockDriverState *bs,
>                                         NULL) < 0) {
>                  rc = -EIO;
>              }
> +        } else if (rc >= 0) {
> +            rc = -EIO;
>          }
>          qio_channel_set_cork(s->ioc, false);
>      } else {
>
diff mbox series

Patch

diff --git a/block/nbd-client.c b/block/nbd-client.c
index 486bfff9f7..9d1e154feb 100644
--- a/block/nbd-client.c
+++ b/block/nbd-client.c
@@ -161,6 +161,8 @@  static int nbd_co_send_request(BlockDriverState *bs,
                                        NULL) < 0) {
                 rc = -EIO;
             }
+        } else if (rc >= 0) {
+            rc = -EIO;
         }
         qio_channel_set_cork(s->ioc, false);
     } else {