]>
Commit | Line | Data |
---|---|---|
b45e13fe AD |
1 | From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 |
2 | From: Eric Blake <eblake@redhat.com> | |
3 | Date: Wed, 27 Sep 2017 17:57:25 +0200 | |
4 | Subject: [PATCH] block/nbd-client: nbd_co_send_request: fix return code | |
5 | ||
6 | RH-Author: Eric Blake <eblake@redhat.com> | |
7 | Message-id: <20170927175725.20023-8-eblake@redhat.com> | |
8 | Patchwork-id: 76673 | |
9 | O-Subject: [RHEV-7.4.z qemu-kvm-rhev PATCH 7/7] block/nbd-client: nbd_co_send_request: fix return code | |
10 | Bugzilla: 1495474 | |
11 | RH-Acked-by: Max Reitz <mreitz@redhat.com> | |
12 | RH-Acked-by: Jeffrey Cody <jcody@redhat.com> | |
13 | RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com> | |
14 | ||
15 | From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> | |
16 | ||
17 | It's incorrect to return success rc >= 0 if we skip qio_channel_writev_all() | |
18 | call due to s->quit. | |
19 | ||
20 | Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> | |
21 | Reviewed-by: Eric Blake <eblake@redhat.com> | |
22 | Message-Id: <20170920124507.18841-4-vsementsov@virtuozzo.com> | |
23 | Signed-off-by: Eric Blake <eblake@redhat.com> | |
24 | (cherry picked from commit a693437037328a95d815ad5aec37ac2f8e130e58) | |
25 | Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com> | |
26 | --- | |
27 | block/nbd-client.c | 2 ++ | |
28 | 1 file changed, 2 insertions(+) | |
29 | ||
30 | diff --git a/block/nbd-client.c b/block/nbd-client.c | |
507c6de3 | 31 | index 434acf647f..76789c1829 100644 |
b45e13fe AD |
32 | --- a/block/nbd-client.c |
33 | +++ b/block/nbd-client.c | |
34 | @@ -156,6 +156,8 @@ static int nbd_co_send_request(BlockDriverState *bs, | |
35 | if (ret != request->len) { | |
36 | rc = -EIO; | |
37 | } | |
38 | + } else if (rc >= 0) { | |
39 | + rc = -EIO; | |
40 | } | |
41 | qio_channel_set_cork(s->ioc, false); | |
42 | } else { | |
43 | -- | |
507c6de3 | 44 | 2.11.0 |
b45e13fe | 45 |