From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 20EE1C43334 for ; Fri, 24 Jun 2022 21:32:09 +0000 (UTC) Received: from localhost ([::1]:49404 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o4quN-00037o-RY for qemu-devel@archiver.kernel.org; Fri, 24 Jun 2022 17:32:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60760) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o4qrt-0008S6-Tw; Fri, 24 Jun 2022 17:29:33 -0400 Received: from forwardcorp1p.mail.yandex.net ([77.88.29.217]:35502) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o4qrs-0004Q8-1o; Fri, 24 Jun 2022 17:29:33 -0400 Received: from myt5-4c5921969858.qloud-c.yandex.net (myt5-4c5921969858.qloud-c.yandex.net [IPv6:2a02:6b8:c12:3b1a:0:640:4c59:2196]) by forwardcorp1p.mail.yandex.net (Yandex) with ESMTP id 0C1202E2010; Sat, 25 Jun 2022 00:29:23 +0300 (MSK) Received: from myt6-81d8ab6a9f9d.qloud-c.yandex.net (myt6-81d8ab6a9f9d.qloud-c.yandex.net [2a02:6b8:c12:520a:0:640:81d8:ab6a]) by myt5-4c5921969858.qloud-c.yandex.net (mxbackcorp/Yandex) with ESMTP id SmxgV3AE9a-TMJS4PQn; Sat, 25 Jun 2022 00:29:22 +0300 X-Yandex-Fwd: 2 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex-team.ru; s=default; t=1656106162; bh=LQYMRtdCGQcUO9O6oDDrH7XxsGe5O2F7xLet6igGGcc=; h=Message-Id:References:Date:Subject:In-Reply-To:Cc:To:From; b=hblDEd07FtmzsgFvxLyfj9T0qOTJlUuyN3J1f8fwDgo5S7bJHC4XMltfNwDbUTd5e Bu15cdfTNYwdV3w9JVCh/D0JrkzD0zDK7rAIx+tgn1gOz/xZq41KyFvZvmhs5wrw8Y i3sjYPzHUwfoEbiztfuQmZcSI4FaWd3uXjMi61yg= Authentication-Results: myt5-4c5921969858.qloud-c.yandex.net; dkim=pass header.i=@yandex-team.ru Received: from vsementsov-win.yandex-team.ru (unknown [2a02:6b8:b081:b64c::1:2c]) by myt6-81d8ab6a9f9d.qloud-c.yandex.net (smtpcorp/Yandex) with ESMTPSA id KXs24KJ458-TMMSfUL9; Sat, 25 Jun 2022 00:29:22 +0300 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client certificate not present) From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Cc: qemu-devel@nongnu.org, kwolf@redhat.com, hreitz@redhat.com, vsementsov@yandex-team.ru, Ari Sundholm Subject: [PATCH v6 03/15] block/blklogwrites: don't care to remove bs->file child on failure Date: Sat, 25 Jun 2022 00:28:18 +0300 Message-Id: <20220624212830.316919-4-vsementsov@yandex-team.ru> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220624212830.316919-1-vsementsov@yandex-team.ru> References: <20220624212830.316919-1-vsementsov@yandex-team.ru> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=77.88.29.217; envelope-from=vsementsov@yandex-team.ru; helo=forwardcorp1p.mail.yandex.net X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" We don't need to remove bs->file, generic layer takes care of it. No other driver cares to remove bs->file on failure by hand. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Hanna Reitz --- block/blklogwrites.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/block/blklogwrites.c b/block/blklogwrites.c index f66a617eb3..7d25df97cc 100644 --- a/block/blklogwrites.c +++ b/block/blklogwrites.c @@ -254,10 +254,6 @@ fail_log: s->log_file = NULL; } fail: - if (ret < 0) { - bdrv_unref_child(bs, bs->file); - bs->file = NULL; - } qemu_opts_del(opts); return ret; } -- 2.25.1