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=-13.6 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 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 1860AC64E8A for ; Wed, 2 Dec 2020 11:13:25 +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 8247022203 for ; Wed, 2 Dec 2020 11:13:24 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8247022203 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]:42850 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kkQ4Z-0003ga-3E for qemu-devel@archiver.kernel.org; Wed, 02 Dec 2020 06:13:23 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:40298) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kkQ3F-00027D-BT for qemu-devel@nongnu.org; Wed, 02 Dec 2020 06:12:01 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:32692) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kkQ38-00065m-VV for qemu-devel@nongnu.org; Wed, 02 Dec 2020 06:12:00 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1606907513; 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=FVsOiuOpkLiYdWHX3DGRPCHlhA0cq6VqmHJNGxO0910=; b=FnLcFdjmvZu6JAnq3owkLJXpTHSN3d1Lb3mBuh/qM59EpPGwX/pMM0c7a1PTHHh+J64DvL CmrAoYH01Fi6ncyK+YXvd2Ye/4fhoT6mTxVlh8/tKjBGXHAb2sKD+z0cUaDmPUwgwEOWoh bsrxjKyr7YUpm+FV/DUD3AC64QnpPxk= 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-541-5B5I1OdRP6-V6FKdQumRWA-1; Wed, 02 Dec 2020 06:11:49 -0500 X-MC-Unique: 5B5I1OdRP6-V6FKdQumRWA-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 7AC35100F340; Wed, 2 Dec 2020 11:11:48 +0000 (UTC) Received: from merkur.fritz.box (ovpn-113-199.ams2.redhat.com [10.36.113.199]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9DC065D6AC; Wed, 2 Dec 2020 11:11:43 +0000 (UTC) Date: Wed, 2 Dec 2020 12:11:42 +0100 From: Kevin Wolf To: Gan Qixin Subject: Re: [PATCH 4/4] block/iscsi.c: Use lock guard macros Message-ID: <20201202111142.GC16765@merkur.fritz.box> References: <20201109154327.325675-1-ganqixin@huawei.com> <20201109154327.325675-5-ganqixin@huawei.com> MIME-Version: 1.0 In-Reply-To: <20201109154327.325675-5-ganqixin@huawei.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=kwolf@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=216.205.24.124; envelope-from=kwolf@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -35 X-Spam_score: -3.6 X-Spam_bar: --- X-Spam_report: (-3.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.497, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=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: zhang.zhanghailiang@huawei.com, qemu-trivial@nongnu.org, qemu-devel@nongnu.org, mreitz@redhat.com, dnbrdsky@gmail.com, stefanha@redhat.com, kuhn.chenqun@huawei.com, pbonzini@redhat.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Am 09.11.2020 um 16:43 hat Gan Qixin geschrieben: > Replace manual lock()/unlock() calls with lock guard macros > (QEMU_LOCK_GUARD/WITH_QEMU_LOCK_GUARD) in block/iscsi.c. > > Signed-off-by: Gan Qixin > --- > block/iscsi.c | 28 +++++++++++++--------------- > 1 file changed, 13 insertions(+), 15 deletions(-) > > diff --git a/block/iscsi.c b/block/iscsi.c > index e30a7e3606..f5f657b582 100644 > --- a/block/iscsi.c > +++ b/block/iscsi.c > @@ -322,7 +322,7 @@ iscsi_aio_cancel(BlockAIOCB *blockacb) > IscsiAIOCB *acb = (IscsiAIOCB *)blockacb; > IscsiLun *iscsilun = acb->iscsilun; > > - qemu_mutex_lock(&iscsilun->mutex); > + QEMU_LOCK_GUARD(&iscsilun->mutex); > > /* If it was cancelled or completed already, our work is done here */ > if (acb->cancelled || acb->status != -EINPROGRESS) { qemu_mutex_unlock(&iscsilun->mutex); return; } I don't think this qemu_mutex_unlock() is right any more now. Kevin