From patchwork Thu Jan 23 11:58:05 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Dr. David Alan Gilbert" X-Patchwork-Id: 1228063 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=M+364/xu; dkim-atps=neutral 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 ozlabs.org (Postfix) with ESMTPS id 483PlS3Fd2z9sSL for ; Fri, 24 Jan 2020 01:28:36 +1100 (AEDT) Received: from localhost ([::1]:57984 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iudTG-0005Lq-2H for incoming@patchwork.ozlabs.org; Thu, 23 Jan 2020 09:28:34 -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 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Miklos Szeredi - Rename "cache=never" to "cache=none" to match 9p's similar option. - Rename CACHE_NORMAL constant to CACHE_AUTO to match the "cache=auto" option. Signed-off-by: Miklos Szeredi Signed-off-by: Dr. David Alan Gilbert Reviewed-by: Daniel P. Berrangé 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= cache mode. could be one of \"auto, " + "always, none\"\n" + " default: auto\n" " -o log_level= 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 with " - "cache=never\n" + "cache=none\n" ); } 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 { }; enum { - CACHE_NEVER, - CACHE_NORMAL, + CACHE_NONE, + CACHE_AUTO, CACHE_ALWAYS, }; @@ -138,8 +138,8 @@ static const struct fuse_opt lo_opts[] = { { "no_xattr", offsetof(struct lo_data, xattr), 0 }, { "timeout=%lf", offsetof(struct lo_data, timeout), 0 }, { "timeout=", offsetof(struct lo_data, timeout_set), 1 }, - { "cache=never", offsetof(struct lo_data, cache), CACHE_NEVER }, - { "cache=auto", offsetof(struct lo_data, cache), CACHE_NORMAL }, + { "cache=none", offsetof(struct lo_data, cache), CACHE_NONE }, + { "cache=auto", offsetof(struct lo_data, cache), CACHE_AUTO }, { "cache=always", 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_info *conn) fuse_log(FUSE_LOG_DEBUG, "lo_init: activating flock locks\n"); conn->want |= FUSE_CAP_FLOCK_LOCKS; } - if ((lo->cache == CACHE_NEVER && !lo->readdirplus_set) || + if ((lo->cache == CACHE_NONE && !lo->readdirplus_set) || lo->readdirplus_clear) { fuse_log(FUSE_LOG_DEBUG, "lo_init: disabling readdirplus\n"); conn->want &= ~FUSE_CAP_READDIRPLUS; @@ -1493,7 +1493,7 @@ static void lo_create(fuse_req_t req, fuse_ino_t parent, const char *name, fi->fh = fh; err = lo_do_lookup(req, parent, name, &e); } - if (lo->cache == CACHE_NEVER) { + if (lo->cache == CACHE_NONE) { fi->direct_io = 1; } else if (lo->cache == CACHE_ALWAYS) { fi->keep_cache = 1; @@ -1578,7 +1578,7 @@ static void lo_open(fuse_req_t req, fuse_ino_t ino, struct fuse_file_info *fi) } fi->fh = fh; - if (lo->cache == CACHE_NEVER) { + if (lo->cache == CACHE_NONE) { fi->direct_io = 1; } else if (lo->cache == CACHE_ALWAYS) { fi->keep_cache = 1; @@ -2395,7 +2395,7 @@ int main(int argc, char *argv[]) lo.root.next = lo.root.prev = &lo.root; lo.root.fd = -1; lo.root.fuse_ino = FUSE_ROOT_ID; - lo.cache = CACHE_NORMAL; + lo.cache = CACHE_AUTO; /* * 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 = 0.0; break; - case CACHE_NORMAL: + case CACHE_AUTO: lo.timeout = 1.0; break;