From nobody Mon Feb 9 09:52:01 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1579612329; cv=none; d=zohomail.com; s=zohoarc; b=aeNP72tUbRMdWlb/SEArqbN5gwrGKYVoTepyZs/80vLzNhwC0RbltEnc0Ii91SJIGFibNDMrW54CgA+AaJS2Px+pYBBRRAd2lksFJpe5Vmv8WyGq4bpRzRyOt+BkuUZK7i9RJVhtsMxIkhGfQlNsy+nOeNShVWfvopgljb7wm3Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1579612329; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=wj8UEs6JMjVfCRf2HR8IZa1RAVwdzi082hH4q47bEMY=; b=HeXjyzIEBLgAfVdeQ1XjlR/1+oKnxppYjfCjS9iRfnDthoBYVZCBZSX/4LBF2/wdjWfEaGxKrFpBq3yd/VtqVO0mW9YXh5a2vPw2Vt2JhAJ6/rX46G4vP0S6XO1y6g6UvCyi3BkUnBZJznSxEDYbBgtNbKtSUTqa+niXbuIxC1I= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1579612329637218.85918799062927; Tue, 21 Jan 2020 05:12:09 -0800 (PST) Received: from localhost ([::1]:53602 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ittKA-00039K-S0 for importer@patchew.org; Tue, 21 Jan 2020 08:12:07 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:52423) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1itsgK-0002Uj-5q for qemu-devel@nongnu.org; Tue, 21 Jan 2020 07:31:00 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1itsgG-0004JZ-8Y for qemu-devel@nongnu.org; Tue, 21 Jan 2020 07:30:56 -0500 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:51729 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 1itsgG-0004JT-4j for qemu-devel@nongnu.org; Tue, 21 Jan 2020 07:30:52 -0500 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-270-_Juvpd3bOcqcO6QN0yRwyg-1; Tue, 21 Jan 2020 07:30:49 -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 66B86107ACCC; Tue, 21 Jan 2020 12:30:48 +0000 (UTC) Received: from dgilbert-t580.localhost (unknown [10.36.118.32]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9850C60C81; Tue, 21 Jan 2020 12:30:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1579609851; 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=wj8UEs6JMjVfCRf2HR8IZa1RAVwdzi082hH4q47bEMY=; b=AnRkVrTL5WTW1CSDlhttRCBEdKp/gRegk6Fsqo3zindTY6PXoXy90kIt4LNHejFjrEasVn UBjcPBNGwStCEuc/6FftYEOhAC9Cad1FlY969HG9m3qBGZsCgXcpwXh1uolm+1wvrwzrAa armdlpGFe7o37bxkYzpDfMvcnT6XDIg= From: "Dr. David Alan Gilbert (git)" To: qemu-devel@nongnu.org, stefanha@redhat.com, vgoyal@redhat.com, berrange@redhat.com, slp@redhat.com, philmd@redhat.com Subject: [PATCH v2 071/109] virtiofsd: rename unref_inode() to unref_inode_lolocked() Date: Tue, 21 Jan 2020 12:23:55 +0000 Message-Id: <20200121122433.50803-72-dgilbert@redhat.com> In-Reply-To: <20200121122433.50803-1-dgilbert@redhat.com> References: <20200121122433.50803-1-dgilbert@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-MC-Unique: _Juvpd3bOcqcO6QN0yRwyg-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com 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: 205.139.110.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: m.mizuma@jp.fujitsu.com, misono.tomohiro@jp.fujitsu.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" From: Miklos Szeredi Signed-off-by: Miklos Szeredi Signed-off-by: Stefan Hajnoczi Reviewed-by: Daniel P. Berrang=C3=A9 --- tools/virtiofsd/passthrough_ll.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/tools/virtiofsd/passthrough_ll.c b/tools/virtiofsd/passthrough= _ll.c index b15633a044..57be7cf007 100644 --- a/tools/virtiofsd/passthrough_ll.c +++ b/tools/virtiofsd/passthrough_ll.c @@ -148,8 +148,8 @@ static const struct fuse_opt lo_opts[] =3D { }; static bool use_syslog =3D false; static int current_log_level; - -static void unref_inode(struct lo_data *lo, struct lo_inode *inode, uint64= _t n); +static void unref_inode_lolocked(struct lo_data *lo, struct lo_inode *inod= e, + uint64_t n); =20 static struct { pthread_mutex_t mutex; @@ -586,7 +586,7 @@ retry: return 0; =20 fail_unref: - unref_inode(lo, p, 1); + unref_inode_lolocked(lo, p, 1); fail: if (retries) { retries--; @@ -624,7 +624,7 @@ fallback: res =3D lo_parent_and_name(lo, inode, path, &parent); if (res !=3D -1) { res =3D utimensat(parent->fd, path, tv, AT_SYMLINK_NOFOLLOW); - unref_inode(lo, parent, 1); + unref_inode_lolocked(lo, parent, 1); } =20 return res; @@ -1027,7 +1027,7 @@ fallback: res =3D lo_parent_and_name(lo, inode, path, &parent); if (res !=3D -1) { res =3D linkat(parent->fd, path, dfd, name, 0); - unref_inode(lo, parent, 1); + unref_inode_lolocked(lo, parent, 1); } =20 return res; @@ -1141,7 +1141,8 @@ static void lo_unlink(fuse_req_t req, fuse_ino_t pare= nt, const char *name) fuse_reply_err(req, res =3D=3D -1 ? errno : 0); } =20 -static void unref_inode(struct lo_data *lo, struct lo_inode *inode, uint64= _t n) +static void unref_inode_lolocked(struct lo_data *lo, struct lo_inode *inod= e, + uint64_t n) { if (!inode) { return; @@ -1181,7 +1182,7 @@ static void lo_forget_one(fuse_req_t req, fuse_ino_t = ino, uint64_t nlookup) (unsigned long long)ino, (unsigned long long)inode->refcount, (unsigned long long)nlookup); =20 - unref_inode(lo, inode, nlookup); + unref_inode_lolocked(lo, inode, nlookup); } =20 static void lo_forget(fuse_req_t req, fuse_ino_t ino, uint64_t nlookup) --=20 2.24.1