From patchwork Fri Jan 17 13:32:57 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 11339071 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 89EC314B7 for ; Fri, 17 Jan 2020 13:38:15 +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 605E020728 for ; Fri, 17 Jan 2020 13:38:15 +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="VbNptmWI" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 605E020728 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:57408 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1isRpG-0007vo-H1 for patchwork-qemu-devel@patchwork.kernel.org; Fri, 17 Jan 2020 08:38:14 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:48900) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1isRkS-0002cB-FX for qemu-devel@nongnu.org; Fri, 17 Jan 2020 08:33:21 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1isRkM-000843-1H for qemu-devel@nongnu.org; Fri, 17 Jan 2020 08:33:15 -0500 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:44765 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1isRkL-00083F-Qu for qemu-devel@nongnu.org; Fri, 17 Jan 2020 08:33:09 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1579267989; 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=ln0Og2iIEXgA6Vm/1Vi7glo705g6JbWtKjkhmoo+5Qk=; b=VbNptmWIuchmCAhm/FqAFsrHDWZn5YIZlt98Xi+mpjqOez9axOJ/FnElBD7fGjmm/dHL/A eQHwCny3aU3I58luQIFkgsQXmtLOH8yweZBdG3KsIy945gjAgHnbfbMQHFvVuzvxvCJWA0 4L1oiXDCvJ7aah6lSfJV5cS3Hrf8JiE= 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-195-LFfcayQeOpaY3-ARgCJIuA-1; Fri, 17 Jan 2020 08:33:07 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B4229100550E for ; Fri, 17 Jan 2020 13:33:06 +0000 (UTC) Received: from x1w.redhat.com (ovpn-206-6.brq.redhat.com [10.40.206.6]) by smtp.corp.redhat.com (Postfix) with ESMTPS id B6E0760FC2; Fri, 17 Jan 2020 13:32:59 +0000 (UTC) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 105/104] virtiofsd: Unref old/new inodes with the same mutex lock in lo_rename() Date: Fri, 17 Jan 2020 14:32:57 +0100 Message-Id: <20200117133257.16906-1-philmd@redhat.com> In-Reply-To: <20191212163904.159893-1-dgilbert@redhat.com> References: <20191212163904.159893-1-dgilbert@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-MC-Unique: LFfcayQeOpaY3-ARgCJIuA-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.120 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: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , "Dr . David Alan Gilbert" , stefanha@redhat.com, Vivek Goyal Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" We can unref both old/new inodes with the same mutex lock. Signed-off-by: Philippe Mathieu-Daudé --- Based-on: <20191212163904.159893-1-dgilbert@redhat.com> "virtiofs daemon" https://www.mail-archive.com/qemu-devel@nongnu.org/msg664652.html tools/virtiofsd/passthrough_ll.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/virtiofsd/passthrough_ll.c b/tools/virtiofsd/passthrough_ll.c index 57f58aef26..5c717cb5a1 100644 --- a/tools/virtiofsd/passthrough_ll.c +++ b/tools/virtiofsd/passthrough_ll.c @@ -1461,8 +1461,10 @@ static void lo_rename(fuse_req_t req, fuse_ino_t parent, const char *name, } out: - unref_inode_lolocked(lo, oldinode, 1); - unref_inode_lolocked(lo, newinode, 1); + pthread_mutex_lock(&lo->mutex); + unref_inode(lo, oldinode, 1); + unref_inode(lo, newinode, 1); + pthread_mutex_unlock(&lo->mutex); lo_inode_put(lo, &oldinode); lo_inode_put(lo, &newinode); lo_inode_put(lo, &parent_inode);