From patchwork Mon Jul 10 15:05:59 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Denis V. Lunev" X-Patchwork-Id: 786229 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3x5pVF5xnDz9s2s for ; Tue, 11 Jul 2017 01:07:33 +1000 (AEST) Received: from localhost ([::1]:41307 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dUaHb-0001xH-Qi for incoming@patchwork.ozlabs.org; Mon, 10 Jul 2017 11:07:31 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47213) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dUaGK-0001Ow-Kv for qemu-devel@nongnu.org; Mon, 10 Jul 2017 11:06:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dUaGJ-0000QA-PK for qemu-devel@nongnu.org; Mon, 10 Jul 2017 11:06:12 -0400 Received: from mailhub.sw.ru ([195.214.232.25]:1772 helo=relay.sw.ru) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dUaGF-0000L3-65; Mon, 10 Jul 2017 11:06:07 -0400 Received: from localhost.localdomain (msk-vpn.virtuozzo.com [195.214.232.6]) by relay.sw.ru (8.13.4/8.13.4) with ESMTP id v6AF61DF006713; Mon, 10 Jul 2017 18:06:02 +0300 (MSK) From: "Denis V. Lunev" To: qemu-devel@nongnu.org Date: Mon, 10 Jul 2017 18:05:59 +0300 Message-Id: <20170710150559.30163-1-den@openvz.org> X-Mailer: git-send-email 2.11.0 X-detected-operating-system: by eggs.gnu.org: OpenBSD 3.x [fuzzy] X-Received-From: 195.214.232.25 Subject: [Qemu-devel] [PATCH v2 1/1] block: fix shadowed variable in bdrv_co_pdiscard X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , "Denis V. Lunev" , Stefan Hajnoczi , qemu-block@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" We've had a shadowed 'ret' variable, which risks returning the wrong value, introduced in commit b9c64947. Signed-off-by: Denis V. Lunev Reviewed-by: Fam Zheng CC: Stefan Hajnoczi CC: Kevin Wolf CC: Eric Blake Reviewed-by: Eric Blake --- block/io.c | 1 - 1 file changed, 1 deletion(-) diff --git a/block/io.c b/block/io.c index 23170a57ee..87208990c4 100644 --- a/block/io.c +++ b/block/io.c @@ -2327,7 +2327,6 @@ int coroutine_fn bdrv_co_pdiscard(BlockDriverState *bs, int64_t offset, assert(max_pdiscard >= bs->bl.request_alignment); while (bytes > 0) { - int ret; int num = bytes; if (head) {