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 X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8C999C43215 for ; Wed, 27 Nov 2019 19:14:56 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 660C020863 for ; Wed, 27 Nov 2019 19:14:56 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 660C020863 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=virtuozzo.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:42080 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ia2m7-0007mp-He for qemu-devel@archiver.kernel.org; Wed, 27 Nov 2019 14:14:55 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:60683) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ia2lA-0007L2-Jn for qemu-devel@nongnu.org; Wed, 27 Nov 2019 14:13:57 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ia2l8-00023b-TG for qemu-devel@nongnu.org; Wed, 27 Nov 2019 14:13:55 -0500 Received: from relay.sw.ru ([185.231.240.75]:53078) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ia2gA-0005fi-Ht; Wed, 27 Nov 2019 14:08:46 -0500 Received: from vovaso.qa.sw.ru ([10.94.3.0] helo=kvm.qa.sw.ru) by relay.sw.ru with esmtp (Exim 4.92.3) (envelope-from ) id 1ia2g6-0003cF-4S; Wed, 27 Nov 2019 22:08:42 +0300 From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Subject: [PATCH v6] nbd: well form nbd_iter_channel_error errp handler Date: Wed, 27 Nov 2019 22:08:40 +0300 Message-Id: <20191127190840.15773-1-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 185.231.240.75 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com, vsementsov@virtuozzo.com, qemu-devel@nongnu.org, mreitz@redhat.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Make nbd_iter_channel_error errp handler well formed: rename local_err to errp_in, as it is IN-parameter here (which is unusual for Error**). Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Eric Blake --- v6: fix commit message add Eric's r-b block/nbd.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/block/nbd.c b/block/nbd.c index 5f18f78a94..345bf902e3 100644 --- a/block/nbd.c +++ b/block/nbd.c @@ -864,18 +864,18 @@ typedef struct NBDReplyChunkIter { } NBDReplyChunkIter; static void nbd_iter_channel_error(NBDReplyChunkIter *iter, - int ret, Error **local_err) + int ret, Error **errp_in) { - assert(ret < 0); + assert(ret < 0 && errp_in && *errp_in); if (!iter->ret) { iter->ret = ret; - error_propagate(&iter->err, *local_err); + error_propagate(&iter->err, *errp_in); } else { - error_free(*local_err); + error_free(*errp_in); } - *local_err = NULL; + *errp_in = NULL; } static void nbd_iter_request_error(NBDReplyChunkIter *iter, int ret) -- 2.21.0