|
 |
7711c0 |
From 19dc347405263456be2c13750a97ee4567665c58 Mon Sep 17 00:00:00 2001
|
|
|
7711c0 |
From: John Snow <jsnow@redhat.com>
|
|
|
7711c0 |
Date: Wed, 27 Mar 2019 17:23:04 +0100
|
|
|
7711c0 |
Subject: [PATCH 126/163] nbd/server: Kill pointless shadowed variable
|
|
|
7711c0 |
|
|
|
7711c0 |
RH-Author: John Snow <jsnow@redhat.com>
|
|
|
7711c0 |
Message-id: <20190327172308.31077-52-jsnow@redhat.com>
|
|
|
7711c0 |
Patchwork-id: 85217
|
|
|
7711c0 |
O-Subject: [RHEL-7.7 qemu-kvm-rhev PATCH 51/55] nbd/server: Kill pointless shadowed variable
|
|
|
7711c0 |
Bugzilla: 1691009
|
|
|
7711c0 |
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
7711c0 |
RH-Acked-by: Max Reitz <mreitz@redhat.com>
|
|
|
7711c0 |
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
7711c0 |
|
|
|
7711c0 |
From: Eric Blake <eblake@redhat.com>
|
|
|
7711c0 |
|
|
|
7711c0 |
lgtm.com pointed out that commit 678ba275 introduced a shadowed
|
|
|
7711c0 |
declaration of local variable 'bs'; thankfully, the inner 'bs'
|
|
|
7711c0 |
obtained by 'blk_bs(blk)' matches the outer one given that we had
|
|
|
7711c0 |
'blk_insert_bs(blk, bs, errp)' a few lines earlier, and there are
|
|
|
7711c0 |
no later uses of 'bs' beyond the scope of the 'if (bitmap)' to
|
|
|
7711c0 |
care if we change the value stored in 'bs' while traveling the
|
|
|
7711c0 |
backing chain to find a bitmap. So simply get rid of the extra
|
|
|
7711c0 |
declaration.
|
|
|
7711c0 |
|
|
|
7711c0 |
Reported-by: Peter Maydell <peter.maydell@linaro.org>
|
|
|
7711c0 |
Signed-off-by: Eric Blake <eblake@redhat.com>
|
|
|
7711c0 |
Message-Id: <20190207191357.6665-1-eblake@redhat.com>
|
|
|
7711c0 |
Signed-off-by: Eric Blake <eblake@redhat.com>
|
|
|
7711c0 |
(cherry picked from commit 269ee27e99cfbff983a9ab067ae22f6182f11fe2)
|
|
|
7711c0 |
Signed-off-by: John Snow <jsnow@redhat.com>
|
|
|
7711c0 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
7711c0 |
---
|
|
|
7711c0 |
nbd/server.c | 1 -
|
|
|
7711c0 |
1 file changed, 1 deletion(-)
|
|
|
7711c0 |
|
|
|
7711c0 |
diff --git a/nbd/server.c b/nbd/server.c
|
|
|
7711c0 |
index 838c150..0910d09 100644
|
|
|
7711c0 |
--- a/nbd/server.c
|
|
|
7711c0 |
+++ b/nbd/server.c
|
|
|
7711c0 |
@@ -1495,7 +1495,6 @@ NBDExport *nbd_export_new(BlockDriverState *bs, uint64_t dev_offset,
|
|
|
7711c0 |
|
|
|
7711c0 |
if (bitmap) {
|
|
|
7711c0 |
BdrvDirtyBitmap *bm = NULL;
|
|
|
7711c0 |
- BlockDriverState *bs = blk_bs(blk);
|
|
|
7711c0 |
|
|
|
7711c0 |
while (true) {
|
|
|
7711c0 |
bm = bdrv_find_dirty_bitmap(bs, bitmap);
|
|
|
7711c0 |
--
|
|
|
7711c0 |
1.8.3.1
|
|
|
7711c0 |
|