From patchwork Fri Jan 19 20:58:44 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Snow X-Patchwork-Id: 863815 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zNYNr60T7z9s74 for ; Sat, 20 Jan 2018 08:09:32 +1100 (AEDT) Received: from localhost ([::1]:44805 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ecduk-0001Xd-UA for incoming@patchwork.ozlabs.org; Fri, 19 Jan 2018 16:09:30 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46579) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ecdl1-0001xX-Tm for qemu-devel@nongnu.org; Fri, 19 Jan 2018 15:59:28 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ecdl1-00066I-BF for qemu-devel@nongnu.org; Fri, 19 Jan 2018 15:59:28 -0500 Received: from mx1.redhat.com ([209.132.183.28]:36820) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ecdkv-00063h-BV; Fri, 19 Jan 2018 15:59:21 -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 mx1.redhat.com (Postfix) with ESMTPS id 73846C047B65; Fri, 19 Jan 2018 20:59:20 +0000 (UTC) Received: from probe.bos.redhat.com (dhcp-17-231.bos.redhat.com [10.18.17.231]) by smtp.corp.redhat.com (Postfix) with ESMTP id E9EA55C1B7; Fri, 19 Jan 2018 20:59:17 +0000 (UTC) From: John Snow To: qemu-block@nongnu.org Date: Fri, 19 Jan 2018 15:58:44 -0500 Message-Id: <20180119205847.7141-11-jsnow@redhat.com> In-Reply-To: <20180119205847.7141-1-jsnow@redhat.com> References: <20180119205847.7141-1-jsnow@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Fri, 19 Jan 2018 20:59:20 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v2 10/13] block/mirror: condense cancellation and relax calls 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: kwolf@redhat.com, jcody@redhat.com, qemu-devel@nongnu.org, mreitz@redhat.com, stefanha@redhat.com, John Snow Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" We can count on the relax call to check cancellation for us, so condense these concurrent calls. Signed-off-by: John Snow --- block/mirror.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/block/mirror.c b/block/mirror.c index 3c73caed5e..a0e0044de2 100644 --- a/block/mirror.c +++ b/block/mirror.c @@ -610,9 +610,7 @@ static int coroutine_fn mirror_dirty_init(MirrorBlockJob *s) int bytes = MIN(s->bdev_length - offset, QEMU_ALIGN_DOWN(INT_MAX, s->granularity)); - block_job_relax(&s->common, 0); - - if (block_job_is_cancelled(&s->common)) { + if (block_job_relax(&s->common, 0)) { s->initial_zeroing_ongoing = false; return 0; } @@ -638,9 +636,7 @@ static int coroutine_fn mirror_dirty_init(MirrorBlockJob *s) int bytes = MIN(s->bdev_length - offset, QEMU_ALIGN_DOWN(INT_MAX, s->granularity)); - block_job_relax(&s->common, 0); - - if (block_job_is_cancelled(&s->common)) { + if (block_job_relax(&s->common, 0)) { return 0; }