Commit 269ee27e authored by Eric Blake's avatar Eric Blake
Browse files

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.

Reported-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Signed-off-by: default avatarEric Blake <eblake@redhat.com>
Message-Id: <20190207191357.6665-1-eblake@redhat.com>
Signed-off-by: default avatarEric Blake <eblake@redhat.com>
parent 22c5f446
Loading
Loading
Loading
Loading
+0 −1
Original line number Diff line number Diff line
@@ -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);