Skip to contentSkip to conversation

nbd/server: Kill pointless shadowed variable

PATCH New Eric Blake 1 participant 1 message Feb 7, 2019

lore
Share & tools
lore

Eric Blake

author
#0 lore raw

PATCH 1/1 nbd/server: Kill pointless shadowed variable

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.

---

I plan to queue this through my NBD tree, unless the trivial tree happens to do a pull request first.

 nbd/server.c | 1 -
 1 file changed, 1 deletion(-)
nbd/server.c +0 -1
index 838c150d8ca..0910d09a6d4 100644
@@ -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);
Signature · 1 line
2.20.1