From nobody Fri Oct 3 11:36:44 2025 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=1579809670; cv=none; d=zohomail.com; s=zohoarc; b=En74M2/F8hDrlXd47hYXa1WxiadjAVQdO2TdveDk/oq8b9E3+F4ekQo8UVUG217WVi7gQAuCI+sqzSNXu1Zq4LYZ06BTIqwjOQvTr1lWD1nTl1DMDtvGs+4SxwUBis+ZV+NP488HADHcuwGOu5VzMU8Pc9SctzKH5o5b+sRK7Tg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1579809670; h=Content-Type:Content-Transfer-Encoding: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=S1ZZK29IBYxR/Dk9Ph6fLhiurhPZ+mhhMZJrxkegYP0=; b=APnIvwtH0pbEr2dEzrmbbUny6fk/6XvU1cIZEPeQKLUbVi9iTGsdUugNH3j9sAuaXzX/JbTu7Me2Hula7mTc+dezs6Z/SwLKTRJ3l6tWhkR140rPZybNcSHr8NF5HyvgmHQYJTA8+y54iqcnw57J6AUpWOMyQPJgYv80wpKDCdQ= 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 1579809670441282.56262624870305; Thu, 23 Jan 2020 12:01:10 -0800 (PST) Received: from localhost ([::1]:32802 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iuif7-00088z-6c for importer@patchew.org; Thu, 23 Jan 2020 15:01:09 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:42265) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iufeb-0005lk-VF for qemu-devel@nongnu.org; Thu, 23 Jan 2020 11:48:26 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iufea-0007mr-Rd for qemu-devel@nongnu.org; Thu, 23 Jan 2020 11:48:25 -0500 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:26586 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 1iufea-0007lu-Mz for qemu-devel@nongnu.org; Thu, 23 Jan 2020 11:48:24 -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-323-hzbJW1V0Mqu1BzAj7ZDtvw-1; Thu, 23 Jan 2020 11:48:22 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id DC763803A41 for ; Thu, 23 Jan 2020 16:48:21 +0000 (UTC) Received: from dgilbert-t580.localhost (ovpn-116-110.ams2.redhat.com [10.36.116.110]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3209E19C69; Thu, 23 Jan 2020 16:48:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1579798104; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=S1ZZK29IBYxR/Dk9Ph6fLhiurhPZ+mhhMZJrxkegYP0=; b=LvsfDWLxb7HG0dacN/Ndad9aOI7oOqPXAPTkEHo5LGYH4QTwD8l59KVfq06HyxRXApH3zx at7yEvSvtJZ7go/74s/jQl8zATk5aRAHTQw1jVAFn+VvQUM2aKdxXZDFpki8RjuSMoDydy dCP3J+MVcnWffSFQB0eVbuKhab+hF58= From: "Dr. David Alan Gilbert (git)" To: qemu-devel@nongnu.org, stefanha@redhat.com Subject: [PULL 080/108] virtiofsd: add helper for lo_data cleanup Date: Thu, 23 Jan 2020 16:46:02 +0000 Message-Id: <20200123164630.91498-81-dgilbert@redhat.com> In-Reply-To: <20200123164630.91498-1-dgilbert@redhat.com> References: <20200123164630.91498-1-dgilbert@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-MC-Unique: hzbJW1V0Mqu1BzAj7ZDtvw-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] 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: , 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: Liu Bo This offers an helper function for lo_data's cleanup. Signed-off-by: Liu Bo Reviewed-by: Daniel P. Berrang=C3=A9 Signed-off-by: Dr. David Alan Gilbert --- tools/virtiofsd/passthrough_ll.c | 37 ++++++++++++++++++-------------- 1 file changed, 21 insertions(+), 16 deletions(-) diff --git a/tools/virtiofsd/passthrough_ll.c b/tools/virtiofsd/passthrough= _ll.c index 056ebe8556..e8dc5c7320 100644 --- a/tools/virtiofsd/passthrough_ll.c +++ b/tools/virtiofsd/passthrough_ll.c @@ -2407,6 +2407,26 @@ static gboolean lo_key_equal(gconstpointer a, gconst= pointer b) return la->ino =3D=3D lb->ino && la->dev =3D=3D lb->dev; } =20 +static void fuse_lo_data_cleanup(struct lo_data *lo) +{ + if (lo->inodes) { + g_hash_table_destroy(lo->inodes); + } + lo_map_destroy(&lo->fd_map); + lo_map_destroy(&lo->dirp_map); + lo_map_destroy(&lo->ino_map); + + if (lo->proc_self_fd >=3D 0) { + close(lo->proc_self_fd); + } + + if (lo->root.fd >=3D 0) { + close(lo->root.fd); + } + + free(lo->source); +} + int main(int argc, char *argv[]) { struct fuse_args args =3D FUSE_ARGS_INIT(argc, argv); @@ -2554,22 +2574,7 @@ err_out2: err_out1: fuse_opt_free_args(&args); =20 - if (lo.inodes) { - g_hash_table_destroy(lo.inodes); - } - lo_map_destroy(&lo.fd_map); - lo_map_destroy(&lo.dirp_map); - lo_map_destroy(&lo.ino_map); - - if (lo.proc_self_fd >=3D 0) { - close(lo.proc_self_fd); - } - - if (lo.root.fd >=3D 0) { - close(lo.root.fd); - } - - free(lo.source); + fuse_lo_data_cleanup(&lo); =20 return ret ? 1 : 0; } --=20 2.24.1