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=-15.1 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 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 79D2DC4338F for ; Fri, 6 Aug 2021 20:43:00 +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 E645261184 for ; Fri, 6 Aug 2021 20:42:59 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org E645261184 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=nongnu.org Received: from localhost ([::1]:54204 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mC6gE-0003Dc-RQ for qemu-devel@archiver.kernel.org; Fri, 06 Aug 2021 16:42:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35100) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mC6fQ-0002Ps-N9 for qemu-devel@nongnu.org; Fri, 06 Aug 2021 16:42:09 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:54695) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mC6fO-0008RV-J1 for qemu-devel@nongnu.org; Fri, 06 Aug 2021 16:42:08 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1628282525; 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: in-reply-to:in-reply-to:references:references; bh=ylXLHI43++HtfQDstbyZtgtutxBnW4IgJW9DEGj0vL0=; b=XwJoVyihztJ5WJz2+30pq+EvbofZbxiV9C4Zr/kvw+VnrkCVi49ypUyRr6Tvzuynqu8hr3 Wh22XYCRhP5026ajljbHrTWf4k7DnWVNhaAQYS0aOWkbtgg5YOUTnaMoGusCQ5Ska0aWtI yaMxAARQyC/fuJ15UYdV8SQlD9uq/zE= 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-568-txtyIJ8VMO2qLHjMfR-MPQ-1; Fri, 06 Aug 2021 16:42:04 -0400 X-MC-Unique: txtyIJ8VMO2qLHjMfR-MPQ-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 50E4B1008060; Fri, 6 Aug 2021 20:42:03 +0000 (UTC) Received: from redhat.com (ovpn-112-138.phx2.redhat.com [10.3.112.138]) by smtp.corp.redhat.com (Postfix) with ESMTPS id ABE5C60853; Fri, 6 Aug 2021 20:42:02 +0000 (UTC) Date: Fri, 6 Aug 2021 15:42:01 -0500 From: Eric Blake To: Max Reitz Subject: Re: [PATCH for-6.2 v3 11/12] mirror: Do not clear .cancelled Message-ID: <20210806204201.aqizvsjyn4mjbc3w@redhat.com> References: <20210806093859.706464-1-mreitz@redhat.com> <20210806093859.706464-12-mreitz@redhat.com> MIME-Version: 1.0 In-Reply-To: <20210806093859.706464-12-mreitz@redhat.com> User-Agent: NeoMutt/20210205-687-0ed190 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=eblake@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Received-SPF: pass client-ip=170.10.133.124; envelope-from=eblake@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -34 X-Spam_score: -3.5 X-Spam_bar: --- X-Spam_report: (-3.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.7, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: Kevin Wolf , Vladimir Sementsov-Ogievskiy , qemu-devel@nongnu.org, qemu-block@nongnu.org Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On Fri, Aug 06, 2021 at 11:38:58AM +0200, Max Reitz wrote: > Clearing .cancelled before leaving the main loop when the job has been > soft-cancelled is no longer necessary since job_is_cancelled() only > returns true for jobs that have been force-cancelled. > > Therefore, this only makes a differences in places that call > job_cancel_requested(). In block/mirror.c, this is done only before > .cancelled was cleared. > > In job.c, there are two callers: > - job_completed_txn_abort() asserts that .cancelled is true, so keeping > it true will not affect this place. > > - job_complete() refuses to let a job complete that has .cancelled set. > It is correct to refuse to let the user invoke job-complete on mirror > jobs that have already been soft-cancelled. > > With this change, there are no places that reset .cancelled to false and > so we can be sure that .force_cancel can only be true of .cancelled is s/of/if/ > true as well. Assert this in job_is_cancelled(). > > Signed-off-by: Max Reitz > --- > block/mirror.c | 2 -- > job.c | 4 +++- > 2 files changed, 3 insertions(+), 3 deletions(-) Reviewed-by: Eric Blake -- Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3266 Virtualization: qemu.org | libvirt.org