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=-6.9 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,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 80A29C2D0DB for ; Thu, 23 Jan 2020 14:29:22 +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 4EEF22077C for ; Thu, 23 Jan 2020 14:29:22 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="M+364/xu" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4EEF22077C 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]:58046 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iudU0-00078U-Vi for qemu-devel@archiver.kernel.org; Thu, 23 Jan 2020 09:29:21 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:41253) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iubAJ-0003v4-06 for qemu-devel@nongnu.org; Thu, 23 Jan 2020 07:00:52 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iubAD-00068K-Qx for qemu-devel@nongnu.org; Thu, 23 Jan 2020 07:00:47 -0500 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:27163 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 1iubAD-00067I-Mn for qemu-devel@nongnu.org; Thu, 23 Jan 2020 07:00:45 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1579780845; 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=i1EOq7CO60lirQD/aOliSVFjBdCyV+UdosKnZr6Gg7Q=; b=M+364/xuLZMPojDM1CG0KXn3KlknHX+dIv8bzu/SPVYLCtJ2aGfGOd40Z0PiDlTETtST2F V6crz1PQAcOvzdY0Mkv68DqZ4ZT3lBQ4aep3SXec60wdLMJUjVZkb7W0JvgiJyqwMCk2qu s4GHeL5oatSAwzdnPD9CXJJmDA93Ch4= 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-314-OjX2nTDYNRWxa-0nAFQJLA-1; Thu, 23 Jan 2020 07:00:41 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 0D93E100550E for ; Thu, 23 Jan 2020 12:00:41 +0000 (UTC) Received: from dgilbert-t580.localhost (unknown [10.36.118.0]) by smtp.corp.redhat.com (Postfix) with ESMTP id 57E678579B; Thu, 23 Jan 2020 12:00:40 +0000 (UTC) From: "Dr. David Alan Gilbert (git)" To: qemu-devel@nongnu.org, stefanha@redhat.com Subject: [PULL 075/111] virtiofsd: passthrough_ll: clean up cache related options Date: Thu, 23 Jan 2020 11:58:05 +0000 Message-Id: <20200123115841.138849-76-dgilbert@redhat.com> In-Reply-To: <20200123115841.138849-1-dgilbert@redhat.com> References: <20200123115841.138849-1-dgilbert@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-MC-Unique: OjX2nTDYNRWxa-0nAFQJLA-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] 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: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Miklos Szeredi - Rename "cache=3Dnever" to "cache=3Dnone" to match 9p's similar option. - Rename CACHE_NORMAL constant to CACHE_AUTO to match the "cache=3Dauto" option. Signed-off-by: Miklos Szeredi Signed-off-by: Dr. David Alan Gilbert Reviewed-by: Daniel P. Berrang=C3=A9 Signed-off-by: Dr. David Alan Gilbert --- tools/virtiofsd/helper.c | 5 ++++- tools/virtiofsd/passthrough_ll.c | 20 ++++++++++---------- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/tools/virtiofsd/helper.c b/tools/virtiofsd/helper.c index 14f5d70c10..567202444a 100644 --- a/tools/virtiofsd/helper.c +++ b/tools/virtiofsd/helper.c @@ -145,6 +145,9 @@ void fuse_cmdline_help(void) " --syslog log to syslog (default stderr)\= n" " -f foreground operation\n" " --daemonize run in background\n" + " -o cache=3D cache mode. could be one of \= "auto, " + "always, none\"\n" + " default: auto\n" " -o log_level=3D log level, default to \"info\= "\n" " level could be one of \"debug, = " "info, warn, err\"\n" @@ -156,7 +159,7 @@ void fuse_cmdline_help(void) " -o readdirplus|no_readdirplus\n" " enable/disable readirplus\n" " default: readdirplus except wit= h " - "cache=3Dnever\n" + "cache=3Dnone\n" ); } =20 diff --git a/tools/virtiofsd/passthrough_ll.c b/tools/virtiofsd/passthrough= _ll.c index 9e7191eb75..b40f2874a7 100644 --- a/tools/virtiofsd/passthrough_ll.c +++ b/tools/virtiofsd/passthrough_ll.c @@ -101,8 +101,8 @@ struct lo_cred { }; =20 enum { - CACHE_NEVER, - CACHE_NORMAL, + CACHE_NONE, + CACHE_AUTO, CACHE_ALWAYS, }; =20 @@ -138,8 +138,8 @@ static const struct fuse_opt lo_opts[] =3D { { "no_xattr", offsetof(struct lo_data, xattr), 0 }, { "timeout=3D%lf", offsetof(struct lo_data, timeout), 0 }, { "timeout=3D", offsetof(struct lo_data, timeout_set), 1 }, - { "cache=3Dnever", offsetof(struct lo_data, cache), CACHE_NEVER }, - { "cache=3Dauto", offsetof(struct lo_data, cache), CACHE_NORMAL }, + { "cache=3Dnone", offsetof(struct lo_data, cache), CACHE_NONE }, + { "cache=3Dauto", offsetof(struct lo_data, cache), CACHE_AUTO }, { "cache=3Dalways", offsetof(struct lo_data, cache), CACHE_ALWAYS }, { "norace", offsetof(struct lo_data, norace), 1 }, { "readdirplus", offsetof(struct lo_data, readdirplus_set), 1 }, @@ -482,7 +482,7 @@ static void lo_init(void *userdata, struct fuse_conn_in= fo *conn) fuse_log(FUSE_LOG_DEBUG, "lo_init: activating flock locks\n"); conn->want |=3D FUSE_CAP_FLOCK_LOCKS; } - if ((lo->cache =3D=3D CACHE_NEVER && !lo->readdirplus_set) || + if ((lo->cache =3D=3D CACHE_NONE && !lo->readdirplus_set) || lo->readdirplus_clear) { fuse_log(FUSE_LOG_DEBUG, "lo_init: disabling readdirplus\n"); conn->want &=3D ~FUSE_CAP_READDIRPLUS; @@ -1493,7 +1493,7 @@ static void lo_create(fuse_req_t req, fuse_ino_t pare= nt, const char *name, fi->fh =3D fh; err =3D lo_do_lookup(req, parent, name, &e); } - if (lo->cache =3D=3D CACHE_NEVER) { + if (lo->cache =3D=3D CACHE_NONE) { fi->direct_io =3D 1; } else if (lo->cache =3D=3D CACHE_ALWAYS) { fi->keep_cache =3D 1; @@ -1578,7 +1578,7 @@ static void lo_open(fuse_req_t req, fuse_ino_t ino, s= truct fuse_file_info *fi) } =20 fi->fh =3D fh; - if (lo->cache =3D=3D CACHE_NEVER) { + if (lo->cache =3D=3D CACHE_NONE) { fi->direct_io =3D 1; } else if (lo->cache =3D=3D CACHE_ALWAYS) { fi->keep_cache =3D 1; @@ -2395,7 +2395,7 @@ int main(int argc, char *argv[]) lo.root.next =3D lo.root.prev =3D &lo.root; lo.root.fd =3D -1; lo.root.fuse_ino =3D FUSE_ROOT_ID; - lo.cache =3D CACHE_NORMAL; + lo.cache =3D CACHE_AUTO; =20 /* * Set up the ino map like this: @@ -2470,11 +2470,11 @@ int main(int argc, char *argv[]) } if (!lo.timeout_set) { switch (lo.cache) { - case CACHE_NEVER: + case CACHE_NONE: lo.timeout =3D 0.0; break; =20 - case CACHE_NORMAL: + case CACHE_AUTO: lo.timeout =3D 1.0; break; =20 --=20 2.24.1