Patchwork [PULL,1/4] nbd/server: Kill pointless shadowed variable

login
register
mail settings
Submitter Eric Blake
Date Feb. 11, 2019, 8:51 p.m.
Message ID <20190211205128.27146-2-eblake@redhat.com>
Download mbox | patch
Permalink /patch/723307/
State New
Headers show

Comments

Eric Blake - Feb. 11, 2019, 8:51 p.m.
lgtm.com pointed out that commit 678ba275 introduced a shadowed
declaration of local variable 'bs'; thankfully, the inner 'bs'
obtained by 'blk_bs(blk)' matches the outer one given that we had
'blk_insert_bs(blk, bs, errp)' a few lines earlier, and there are
no later uses of 'bs' beyond the scope of the 'if (bitmap)' to
care if we change the value stored in 'bs' while traveling the
backing chain to find a bitmap.  So simply get rid of the extra
declaration.

Reported-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Eric Blake <eblake@redhat.com>
Message-Id: <20190207191357.6665-1-eblake@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
---
 nbd/server.c | 1 -
 1 file changed, 1 deletion(-)

Patch

diff --git a/nbd/server.c b/nbd/server.c
index 838c150d8ca..0910d09a6d4 100644
--- a/nbd/server.c
+++ b/nbd/server.c
@@ -1495,7 +1495,6 @@  NBDExport *nbd_export_new(BlockDriverState *bs, uint64_t dev_offset,

     if (bitmap) {
         BdrvDirtyBitmap *bm = NULL;
-        BlockDriverState *bs = blk_bs(blk);

         while (true) {
             bm = bdrv_find_dirty_bitmap(bs, bitmap);