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=-6.5 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS 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 2ADA5C35242 for ; Fri, 14 Feb 2020 20:12:46 +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 DD4E6222C4 for ; Fri, 14 Feb 2020 20:12:45 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="hHqfhU2T" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org DD4E6222C4 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:45190 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j2hKP-0006qW-3N for qemu-devel@archiver.kernel.org; Fri, 14 Feb 2020 15:12:45 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:51929) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j2hGR-0007Wa-8P for qemu-devel@nongnu.org; Fri, 14 Feb 2020 15:08:41 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j2hGQ-0005UY-8A for qemu-devel@nongnu.org; Fri, 14 Feb 2020 15:08:39 -0500 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:44191 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1j2hGQ-0005U3-48 for qemu-devel@nongnu.org; Fri, 14 Feb 2020 15:08:38 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1581710917; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=8Dc4xDxLeU229aolKHiPPEcJW+xIohTddfln6Uvfj9w=; b=hHqfhU2Tg9F2SXYFmoYbJ9bf9usZgYkr1vv6pc3P/jJ825ZAAIRKgAiHXkOSLv+arCRjyO xR1iEgI+47UijP43h/cWT6n8199ZNViCdNzDQfsBuXLE3JreonQ+yxRHGhRxYO94ldzdxU e4mucLGOLbTkGzQkHe73fLu3RcqL+8s= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-141-VU9e4SsjOQOSOfHS-QLFxQ-1; Fri, 14 Feb 2020 15:08:33 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D4B03107ACC7; Fri, 14 Feb 2020 20:08:32 +0000 (UTC) Received: from linux.fritz.box.com (unknown [10.36.118.128]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5A8765C1C3; Fri, 14 Feb 2020 20:08:31 +0000 (UTC) From: Kevin Wolf To: qemu-block@nongnu.org Subject: [PATCH 3/7] commit: Fix argument order for block_job_error_action() Date: Fri, 14 Feb 2020 21:08:08 +0100 Message-Id: <20200214200812.28180-4-kwolf@redhat.com> In-Reply-To: <20200214200812.28180-1-kwolf@redhat.com> References: <20200214200812.28180-1-kwolf@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-MC-Unique: VU9e4SsjOQOSOfHS-QLFxQ-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.81 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, pkrempa@redhat.com, qemu-devel@nongnu.org, mreitz@redhat.com, nsoffer@redhat.com, jsnow@redhat.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" The block_job_error_action() error call in the commit job gives the on_err and is_read arguments in the wrong order. Fix this. (Of course, hard-coded is_read =3D false is wrong, too, but that's a separate problem for a separate patch.) Signed-off-by: Kevin Wolf --- block/commit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/block/commit.c b/block/commit.c index cce898a4f3..8189f079d2 100644 --- a/block/commit.c +++ b/block/commit.c @@ -182,7 +182,7 @@ static int coroutine_fn commit_run(Job *job, Error **er= rp) } if (ret < 0) { BlockErrorAction action =3D - block_job_error_action(&s->common, false, s->on_error, -re= t); + block_job_error_action(&s->common, s->on_error, false, -re= t); if (action =3D=3D BLOCK_ERROR_ACTION_REPORT) { goto out; } else { --=20 2.20.1