From: Alberto Garcia Date: Thu, 3 Sep 2020 16:37:48 +0000 (+0200) Subject: qcow2: Don't check nb_clusters when removing l2meta from the list X-Git-Tag: v5.2.0-rc0~114^2~12 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f7bd5bba1b8ce7200600bacee024bce525083f60;p=thirdparty%2Fqemu.git qcow2: Don't check nb_clusters when removing l2meta from the list In the past, when a new cluster was allocated the l2meta structure was a variable in the stack so it was necessary to have a way to tell whether it had been initialized and contained valid data or not. The nb_clusters field was used for this purpose. Since commit f50f88b9fe this is no longer the case, l2meta (nowadays a pointer to a list) is only allocated when needed and nb_clusters is guaranteed to be > 0 so this check is unnecessary. Signed-off-by: Alberto Garcia Message-Id: Signed-off-by: Max Reitz --- diff --git a/block/qcow2.c b/block/qcow2.c index ef9a45e82fa..3e8114dcf85 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -2111,9 +2111,7 @@ static coroutine_fn int qcow2_handle_l2meta(BlockDriverState *bs, } /* Take the request off the list of running requests */ - if (l2meta->nb_clusters != 0) { - QLIST_REMOVE(l2meta, next_in_flight); - } + QLIST_REMOVE(l2meta, next_in_flight); qemu_co_queue_restart_all(&l2meta->dependent_requests);