[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL v2 18/20] nbd: Drop dead code spotted by Coverity
From: |
Kevin Wolf |
Subject: |
[PULL v2 18/20] nbd: Drop dead code spotted by Coverity |
Date: |
Fri, 24 Jun 2022 17:41:01 +0200 |
From: Eric Blake <eblake@redhat.com>
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>
Message-Id: <20220516210519.76135-1-eblake@redhat.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Vladimir Sementsov-Ogievskiy <v.sementsov-og@mail.ru>
Signed-off-by: Kevin Wolf <kwolf@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.35.3
- [PULL v2 10/20] libvduse: Add VDUSE (vDPA Device in Userspace) library, (continued)
- [PULL v2 10/20] libvduse: Add VDUSE (vDPA Device in Userspace) library, Kevin Wolf, 2022/06/24
- [PULL v2 08/20] block/export: Abstract out the logic of virtio-blk I/O process, Kevin Wolf, 2022/06/24
- [PULL v2 14/20] qsd: document vduse-blk exports, Kevin Wolf, 2022/06/24
- [PULL v2 15/20] block/rbd: report a better error when namespace does not exist, Kevin Wolf, 2022/06/24
- [PULL v2 12/20] vduse-blk: Add vduse-blk resize support, Kevin Wolf, 2022/06/24
- [PULL v2 16/20] block/gluster: correctly set max_pdiscard, Kevin Wolf, 2022/06/24
- [PULL v2 17/20] aio_wait_kick: add missing memory barrier, Kevin Wolf, 2022/06/24
- [PULL v2 19/20] vduse-blk: Add serial option, Kevin Wolf, 2022/06/24
- [PULL v2 18/20] nbd: Drop dead code spotted by Coverity,
Kevin Wolf <=
- [PULL v2 20/20] vduse-blk: Add name option, Kevin Wolf, 2022/06/24
- Re: [PULL v2 00/20] Block layer patches, Richard Henderson, 2022/06/24