From nobody Sat Feb 7 09:38:13 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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 (zoho.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=1571920566; cv=none; d=zoho.com; s=zohoarc; b=WDZ2MIom8t9PDqicB2ui/mbfjjdkGKYmU41UW8Vws8P3F2LzxUPxiQbwaIhP5GW67bL1pdqj6r/GZq83ApRtE2Tl7HXX/BRXet7tTWNDhfrDI4Q13nQlm56cKGSkW9qXftElbPgHzmlV4EIPGZfjO672242pgozxPeH7bu8BRJ4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571920566; 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=+Ra0m6R0Jq8MJjj4NSDieXizCZ4KTnChLN5Wi+ZEnxA=; b=c67zbccJ7cPgWH1cRHl3dDJ1Z3PPEqFbDwuVVI48kxwsTDTVlWqIAamER7gSomo/e7Vt513L2Y/sxoJBBiKxcb6pdv50krlXz07L0nhFhPAfpR25HSmvlvNqtEeHfb2GIJqtww+6EVqtKxvDNy+FDi15DuLRHcT/Xtf59ZCgGzo= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.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 1571920566579420.5333427764193; Thu, 24 Oct 2019 05:36:06 -0700 (PDT) Received: from localhost ([::1]:41166 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iNcLV-0003zz-5C for importer@patchew.org; Thu, 24 Oct 2019 08:36:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39604) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iNbIq-00052W-Kr for qemu-devel@nongnu.org; Thu, 24 Oct 2019 07:29:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iNbIo-0000Jl-Dr for qemu-devel@nongnu.org; Thu, 24 Oct 2019 07:29:16 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:56640 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 1iNbIo-0000JJ-8E for qemu-devel@nongnu.org; Thu, 24 Oct 2019 07:29:14 -0400 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-62-mONigV8WMFWAMMrrVUKASg-1; Thu, 24 Oct 2019 07:29:08 -0400 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 853E580183D; Thu, 24 Oct 2019 11:29:07 +0000 (UTC) Received: from dgilbert-t580.localhost (ovpn-117-248.ams2.redhat.com [10.36.117.248]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0BC1852D5; Thu, 24 Oct 2019 11:29:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571916552; 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=+Ra0m6R0Jq8MJjj4NSDieXizCZ4KTnChLN5Wi+ZEnxA=; b=Tr9az883OlYmz2kxoodyFPs9tvxdH9Z/51deOfDZFgdvsflQowokl0uKKyf7iYAGkzjElA 0cqUwuAhUpjm4nYzVCcmFK78xI65cVe+pIw0mQ/W+qcyYYbHtqOsm68dv1bs+tAFiznutx 2XHbSr8kHREwIYf4onT89ulOPCLDQ2Y= From: "Dr. David Alan Gilbert (git)" To: qemu-devel@nongnu.org, renzhen@linux.alibaba.com, eguan@linux.alibaba.com, ganesh.mahalingam@intel.com, m.mizuma@jp.fujitsu.com, mszeredi@redhat.com, misono.tomohiro@jp.fujitsu.com, tao.peng@linux.alibaba.com, piaojun@huawei.com, stefanha@redhat.com, vgoyal@redhat.com, mst@redhat.com, berrange@redhat.com Subject: [PATCH 25/25] virtiofsd: print log only when priority is high enough Date: Thu, 24 Oct 2019 12:27:18 +0100 Message-Id: <20191024112718.34657-26-dgilbert@redhat.com> In-Reply-To: <20191024112718.34657-1-dgilbert@redhat.com> References: <20191024112718.34657-1-dgilbert@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-MC-Unique: mONigV8WMFWAMMrrVUKASg-1 X-Mimecast-Spam-Score: 0 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: , 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: Eryu Guan Introduce "-o log_level=3D" command line option to specify current log level (priority), valid values are "debug info warn err", e.g. ./virtiofsd -o log_level=3Ddebug ... So only log priority higher than "debug" will be printed to stderr/syslog. And the default level is info. The "-o debug"/"-d" options are kept, and imply debug log level. Signed-off-by: Eryu Guan Reviewed-by: Dr. David Alan Gilbert dgilbert: Reworked for libfuse's log_func Signed-off-by: Dr. David Alan Gilbert --- contrib/virtiofsd/fuse_log.c | 4 ++ contrib/virtiofsd/fuse_lowlevel.c | 79 ++++++++++------------- contrib/virtiofsd/fuse_lowlevel.h | 1 + contrib/virtiofsd/helper.c | 9 ++- contrib/virtiofsd/passthrough_ll.c | 100 +++++++++++++---------------- 5 files changed, 91 insertions(+), 102 deletions(-) diff --git a/contrib/virtiofsd/fuse_log.c b/contrib/virtiofsd/fuse_log.c index 0d268ab014..b11f6d0c08 100644 --- a/contrib/virtiofsd/fuse_log.c +++ b/contrib/virtiofsd/fuse_log.c @@ -8,6 +8,10 @@ See the file COPYING.LIB */ =20 +#include +#include +#include +#include #include "fuse_log.h" =20 #include diff --git a/contrib/virtiofsd/fuse_lowlevel.c b/contrib/virtiofsd/fuse_low= level.c index 8f9a59a34c..20f2190194 100644 --- a/contrib/virtiofsd/fuse_lowlevel.c +++ b/contrib/virtiofsd/fuse_lowlevel.c @@ -155,20 +155,17 @@ static int fuse_send_msg(struct fuse_session *se, str= uct fuse_chan *ch, struct fuse_out_header *out =3D iov[0].iov_base; =20 out->len =3D iov_length(iov, count); - if (se->debug) { - if (out->unique =3D=3D 0) { - fuse_log(FUSE_LOG_DEBUG, "NOTIFY: code=3D%d length=3D%u\n", - out->error, out->len); - } else if (out->error) { - fuse_log(FUSE_LOG_DEBUG, - " unique: %llu, error: %i (%s), outsize: %i\n", - (unsigned long long) out->unique, out->error, - strerror(-out->error), out->len); - } else { - fuse_log(FUSE_LOG_DEBUG, - " unique: %llu, success, outsize: %i\n", - (unsigned long long) out->unique, out->len); - } + if (out->unique =3D=3D 0) { + fuse_log(FUSE_LOG_DEBUG, "NOTIFY: code=3D%d length=3D%u\n", + out->error, out->len); + } else if (out->error) { + fuse_log(FUSE_LOG_DEBUG, " unique: %llu, error: %i (%s), outsize: %i\n= ", + (unsigned long long) out->unique, + out->error, strerror(-out->error), + out->len); + } else { + fuse_log(FUSE_LOG_DEBUG, " unique: %llu, success, outsize: %i\n", + (unsigned long long) out->unique, out->len); } =20 if (fuse_lowlevel_is_virtio(se)) { @@ -1663,9 +1660,8 @@ static void do_interrupt(fuse_req_t req, fuse_ino_t n= odeid, return; } =20 - if (se->debug) - fuse_log(FUSE_LOG_DEBUG, "INTERRUPT: %llu\n", - (unsigned long long) arg->unique); + fuse_log(FUSE_LOG_DEBUG, "INTERRUPT: %llu\n", + (unsigned long long) arg->unique); =20 req->u.i.unique =3D arg->unique; =20 @@ -1878,13 +1874,11 @@ static void do_init(fuse_req_t req, fuse_ino_t node= id, } } =20 - if (se->debug) { - fuse_log(FUSE_LOG_DEBUG, "INIT: %u.%u\n", arg->major, arg->minor); - if (arg->major =3D=3D 7 && arg->minor >=3D 6) { - fuse_log(FUSE_LOG_DEBUG, "flags=3D0x%08x\n", arg->flags); - fuse_log(FUSE_LOG_DEBUG, "max_readahead=3D0x%08x\n", - arg->max_readahead); - } + fuse_log(FUSE_LOG_DEBUG, "INIT: %u.%u\n", arg->major, arg->minor); + if (arg->major =3D=3D 7 && arg->minor >=3D 6) { + fuse_log(FUSE_LOG_DEBUG, "flags=3D0x%08x\n", arg->flags); + fuse_log(FUSE_LOG_DEBUG, "max_readahead=3D0x%08x\n", + arg->max_readahead); } se->conn.proto_major =3D arg->major; se->conn.proto_minor =3D arg->minor; @@ -2070,19 +2064,17 @@ static void do_init(fuse_req_t req, fuse_ino_t node= id, if (se->conn.proto_minor >=3D 23) outarg.time_gran =3D se->conn.time_gran; =20 - if (se->debug) { - fuse_log(FUSE_LOG_DEBUG, " INIT: %u.%u\n", outarg.major, outarg.minor); - fuse_log(FUSE_LOG_DEBUG, " flags=3D0x%08x\n", outarg.flags); - fuse_log(FUSE_LOG_DEBUG, " max_readahead=3D0x%08x\n", - outarg.max_readahead); - fuse_log(FUSE_LOG_DEBUG, " max_write=3D0x%08x\n", outarg.max_write); - fuse_log(FUSE_LOG_DEBUG, " max_background=3D%i\n", - outarg.max_background); - fuse_log(FUSE_LOG_DEBUG, " congestion_threshold=3D%i\n", - outarg.congestion_threshold); - fuse_log(FUSE_LOG_DEBUG, " time_gran=3D%u\n", - outarg.time_gran); - } + fuse_log(FUSE_LOG_DEBUG, " INIT: %u.%u\n", outarg.major, outarg.minor); + fuse_log(FUSE_LOG_DEBUG, " flags=3D0x%08x\n", outarg.flags); + fuse_log(FUSE_LOG_DEBUG, " max_readahead=3D0x%08x\n", + outarg.max_readahead); + fuse_log(FUSE_LOG_DEBUG, " max_write=3D0x%08x\n", outarg.max_write); + fuse_log(FUSE_LOG_DEBUG, " max_background=3D%i\n", + outarg.max_background); + fuse_log(FUSE_LOG_DEBUG, " congestion_threshold=3D%i\n", + outarg.congestion_threshold); + fuse_log(FUSE_LOG_DEBUG, " time_gran=3D%u\n", + outarg.time_gran); if (arg->minor < 5) outargsize =3D FUSE_COMPAT_INIT_OUT_SIZE; else if (arg->minor < 23) @@ -2370,13 +2362,12 @@ void fuse_session_process_buf_int(struct fuse_sessi= on *se, in =3D fuse_mbuf_iter_advance(&iter, sizeof(*in)); assert(in); /* caller guarantees the input buffer is large enough */ =20 - if (se->debug) { - fuse_log(FUSE_LOG_DEBUG, - "unique: %llu, opcode: %s (%i), nodeid: %llu, insize: %zu, pid: %u\n", - (unsigned long long) in->unique, - opname((enum fuse_opcode) in->opcode), in->opcode, - (unsigned long long) in->nodeid, buf->size, in->pid); - } + fuse_log(FUSE_LOG_DEBUG, + "unique: %llu, opcode: %s (%i), nodeid: %llu, insize: %zu, pid: %u\n", + (unsigned long long) in->unique, + opname((enum fuse_opcode) in->opcode), in->opcode, + (unsigned long long) in->nodeid, buf->size, + in->pid); =20 req =3D fuse_ll_alloc_req(se); if (req =3D=3D NULL) { diff --git a/contrib/virtiofsd/fuse_lowlevel.h b/contrib/virtiofsd/fuse_low= level.h index 112596caaf..49cf5b22ff 100644 --- a/contrib/virtiofsd/fuse_lowlevel.h +++ b/contrib/virtiofsd/fuse_lowlevel.h @@ -1799,6 +1799,7 @@ struct fuse_cmdline_opts { int print_capabilities; int clone_fd; int syslog; + int log_level; unsigned int max_idle_threads; }; =20 diff --git a/contrib/virtiofsd/helper.c b/contrib/virtiofsd/helper.c index b1e45aee05..d9eb9ff62c 100644 --- a/contrib/virtiofsd/helper.c +++ b/contrib/virtiofsd/helper.c @@ -29,7 +29,6 @@ #define FUSE_HELPER_OPT_VALUE(t, p, v) \ { t, offsetof(struct fuse_cmdline_opts, p), v } =20 - static const struct fuse_opt fuse_helper_opts[] =3D { FUSE_HELPER_OPT("-h", show_help), FUSE_HELPER_OPT("--help", show_help), @@ -54,6 +53,10 @@ static const struct fuse_opt fuse_helper_opts[] =3D { FUSE_HELPER_OPT("clone_fd", clone_fd), FUSE_HELPER_OPT("max_idle_threads=3D%u", max_idle_threads), FUSE_HELPER_OPT("--syslog", syslog), + FUSE_HELPER_OPT_VALUE("log_level=3Ddebug", log_level, FUSE_LOG_DEBUG), + FUSE_HELPER_OPT_VALUE("log_level=3Dinfo", log_level, FUSE_LOG_INFO), + FUSE_HELPER_OPT_VALUE("log_level=3Dwarn", log_level, FUSE_LOG_WARNING), + FUSE_HELPER_OPT_VALUE("log_level=3Derr", log_level, FUSE_LOG_ERR), FUSE_OPT_END }; =20 @@ -143,7 +146,9 @@ void fuse_cmdline_help(void) " -o clone_fd use separate fuse device fd for ea= ch thread\n" " (may improve performance)\n" " -o max_idle_threads the maximum number of idle worker = threads\n" - " allowed (default: 10)\n"); + " allowed (default: 10)\n" + " -o log_level=3D log level, default to \"info\"\n" + " level could be one of \"debug, inf= o, warn, err\"\n"); } =20 static int fuse_helper_opt_proc(void *data, const char *arg, int key, diff --git a/contrib/virtiofsd/passthrough_ll.c b/contrib/virtiofsd/passthr= ough_ll.c index b413687720..8ad41b1072 100644 --- a/contrib/virtiofsd/passthrough_ll.c +++ b/contrib/virtiofsd/passthrough_ll.c @@ -36,6 +36,7 @@ =20 #include "fuse_virtio.h" #include "fuse_lowlevel.h" +#include "fuse_log.h" #include #include #include @@ -153,6 +154,7 @@ static const struct fuse_opt lo_opts[] =3D { FUSE_OPT_END }; static bool use_syslog =3D false; +static int current_log_level; =20 static void unref_inode(struct lo_data *lo, struct lo_inode *inode, uint64= _t n); =20 @@ -446,11 +448,6 @@ static int lo_fd(fuse_req_t req, fuse_ino_t ino) return inode ? inode->fd : -1; } =20 -static bool lo_debug(fuse_req_t req) -{ - return lo_data(req)->debug !=3D 0; -} - static void lo_init(void *userdata, struct fuse_conn_info *conn) { @@ -461,13 +458,11 @@ static void lo_init(void *userdata, =20 if (lo->writeback && conn->capable & FUSE_CAP_WRITEBACK_CACHE) { - if (lo->debug) - fuse_log(FUSE_LOG_DEBUG, "lo_init: activating writeback\n"); + fuse_log(FUSE_LOG_DEBUG, "lo_init: activating writeback\n"); conn->want |=3D FUSE_CAP_WRITEBACK_CACHE; } if (lo->flock && conn->capable & FUSE_CAP_FLOCK_LOCKS) { - if (lo->debug) - fuse_log(FUSE_LOG_DEBUG, "lo_init: activating flock locks\n"); + fuse_log(FUSE_LOG_DEBUG, "lo_init: activating flock locks\n"); conn->want |=3D FUSE_CAP_FLOCK_LOCKS; } } @@ -789,9 +784,9 @@ static int lo_do_lookup(fuse_req_t req, fuse_ino_t pare= nt, const char *name, } e->ino =3D inode->fuse_ino; =20 - if (lo_debug(req)) - fuse_log(FUSE_LOG_DEBUG, " %lli/%s -> %lli\n", - (unsigned long long) parent, name, (unsigned long long) e->ino); + fuse_log(FUSE_LOG_DEBUG, " %lli/%s -> %lli\n", + (unsigned long long) parent, name, + (unsigned long long) e->ino); =20 return 0; =20 @@ -807,9 +802,7 @@ static void lo_lookup(fuse_req_t req, fuse_ino_t parent= , const char *name) struct fuse_entry_param e; int err; =20 - if (lo_debug(req)) - fuse_log(FUSE_LOG_DEBUG, "lo_lookup(parent=3D%" PRIu64 ", name=3D%s)\n", - parent, name); + fuse_log(FUSE_LOG_DEBUG, "lo_lookup(parent=3D%" PRIu64 ", name=3D%s)\n", = parent, name); =20 /* Don't use is_safe_path_component(), allow "." and ".." for NFS export * support. @@ -911,9 +904,9 @@ static void lo_mknod_symlink(fuse_req_t req, fuse_ino_t= parent, if (saverr) goto out; =20 - if (lo_debug(req)) - fuse_log(FUSE_LOG_DEBUG, " %lli/%s -> %lli\n", - (unsigned long long) parent, name, (unsigned long long) e.ino); + fuse_log(FUSE_LOG_DEBUG, " %lli/%s -> %lli\n", + (unsigned long long) parent, name, + (unsigned long long) e.ino); =20 fuse_reply_entry(req, &e); return; @@ -1010,10 +1003,9 @@ static void lo_link(fuse_req_t req, fuse_ino_t ino, = fuse_ino_t parent, pthread_mutex_unlock(&lo->mutex); e.ino =3D inode->fuse_ino; =20 - if (lo_debug(req)) - fuse_log(FUSE_LOG_DEBUG, " %lli/%s -> %lli\n", - (unsigned long long) parent, name, - (unsigned long long) e.ino); + fuse_log(FUSE_LOG_DEBUG, " %lli/%s -> %lli\n", + (unsigned long long) parent, name, + (unsigned long long) e.ino); =20 fuse_reply_entry(req, &e); return; @@ -1107,12 +1099,10 @@ static void lo_forget_one(fuse_req_t req, fuse_ino_= t ino, uint64_t nlookup) if (!inode) return; =20 - if (lo_debug(req)) { - fuse_log(FUSE_LOG_DEBUG, " forget %lli %lli -%lli\n", - (unsigned long long) ino, - (unsigned long long) inode->refcount, - (unsigned long long) nlookup); - } + fuse_log(FUSE_LOG_DEBUG, " forget %lli %lli -%lli\n", + (unsigned long long) ino, + (unsigned long long) inode->refcount, + (unsigned long long) nlookup); =20 unref_inode(lo, inode, nlookup); } @@ -1364,9 +1354,7 @@ static void lo_create(fuse_req_t req, fuse_ino_t pare= nt, const char *name, int err; struct lo_cred old =3D {}; =20 - if (lo_debug(req)) - fuse_log(FUSE_LOG_DEBUG, "lo_create(parent=3D%" PRIu64 ", name=3D%s)\n", - parent, name); + fuse_log(FUSE_LOG_DEBUG, "lo_create(parent=3D%" PRIu64 ", name=3D%s)\n", = parent, name); =20 if (!is_safe_path_component(name)) { fuse_reply_err(req, EINVAL); @@ -1439,9 +1427,7 @@ static void lo_open(fuse_req_t req, fuse_ino_t ino, s= truct fuse_file_info *fi) char buf[64]; struct lo_data *lo =3D lo_data(req); =20 - if (lo_debug(req)) - fuse_log(FUSE_LOG_DEBUG, "lo_open(ino=3D%" PRIu64 ", flags=3D%d)\n", - ino, fi->flags); + fuse_log(FUSE_LOG_DEBUG, "lo_open(ino=3D%" PRIu64 ", flags=3D%d)\n", ino,= fi->flags); =20 /* With writeback cache, kernel may send read requests even when userspace opened write-only */ @@ -1543,9 +1529,8 @@ static void lo_read(fuse_req_t req, fuse_ino_t ino, s= ize_t size, { struct fuse_bufvec buf =3D FUSE_BUFVEC_INIT(size); =20 - if (lo_debug(req)) - fuse_log(FUSE_LOG_DEBUG, "lo_read(ino=3D%" PRIu64 ", size=3D%zd, " - "off=3D%lu)\n", ino, size, (unsigned long) offset); + fuse_log(FUSE_LOG_DEBUG, "lo_read(ino=3D%" PRIu64 ", size=3D%zd, " + "off=3D%lu)\n", ino, size, (unsigned long) offset); =20 buf.buf[0].flags =3D FUSE_BUF_IS_FD | FUSE_BUF_FD_SEEK; buf.buf[0].fd =3D lo_fi_fd(req, fi); @@ -1567,9 +1552,8 @@ static void lo_write_buf(fuse_req_t req, fuse_ino_t i= no, out_buf.buf[0].fd =3D lo_fi_fd(req, fi); out_buf.buf[0].pos =3D off; =20 - if (lo_debug(req)) - fuse_log(FUSE_LOG_DEBUG, "lo_write(ino=3D%" PRIu64 ", size=3D%zd, off=3D= %lu)\n", - ino, out_buf.buf[0].size, (unsigned long) off); + fuse_log(FUSE_LOG_DEBUG, "lo_write_buf(ino=3D%" PRIu64 ", size=3D%zd, off= =3D%lu)\n", + ino, out_buf.buf[0].size, (unsigned long) off); =20 /* * If kill_priv is set, drop CAP_FSETID which should lead to kernel @@ -1662,10 +1646,8 @@ static void lo_getxattr(fuse_req_t req, fuse_ino_t i= no, const char *name, if (!lo_data(req)->xattr) goto out; =20 - if (lo_debug(req)) { - fuse_log(FUSE_LOG_DEBUG, "lo_getxattr(ino=3D%" PRIu64 ", name=3D%s size= =3D%zd)\n", - ino, name, size); - } + fuse_log(FUSE_LOG_DEBUG, "lo_getxattr(ino=3D%" PRIu64 ", name=3D%s size= =3D%zd)\n", + ino, name, size); =20 if (inode->is_symlink) { /* Sorry, no race free way to getxattr on symlink. */ @@ -1734,10 +1716,7 @@ static void lo_listxattr(fuse_req_t req, fuse_ino_t = ino, size_t size) if (!lo_data(req)->xattr) goto out; =20 - if (lo_debug(req)) { - fuse_log(FUSE_LOG_DEBUG, "lo_listxattr(ino=3D%" PRIu64 ", size=3D%zd)\n", - ino, size); - } + fuse_log(FUSE_LOG_DEBUG, "lo_listxattr(ino=3D%" PRIu64 ", size=3D%zd)\n",= ino, size); =20 if (inode->is_symlink) { /* Sorry, no race free way to listxattr on symlink. */ @@ -1806,10 +1785,9 @@ static void lo_setxattr(fuse_req_t req, fuse_ino_t i= no, const char *name, if (!lo_data(req)->xattr) goto out; =20 - if (lo_debug(req)) { - fuse_log(FUSE_LOG_DEBUG, "lo_setxattr(ino=3D%" PRIu64 ", name=3D%s value= =3D%s size=3D%zd)\n", - ino, name, value, size); - } + fuse_log(FUSE_LOG_DEBUG, "lo_setxattr(ino=3D%" PRIu64, + ", name=3D%s value=3D%s size=3D%zd)\n", + ino, name, value, size); =20 if (inode->is_symlink) { /* Sorry, no race free way to removexattr on symlink. */ @@ -1853,10 +1831,8 @@ static void lo_removexattr(fuse_req_t req, fuse_ino_= t ino, const char *name) if (!lo_data(req)->xattr) goto out; =20 - if (lo_debug(req)) { - fuse_log(FUSE_LOG_DEBUG, "lo_removexattr(ino=3D%" PRIu64 ", name=3D%s)\n= ", - ino, name); - } + fuse_log(FUSE_LOG_DEBUG, "lo_removexattr(ino=3D%" PRIu64 ", name=3D%s)\n", + ino, name); =20 if (inode->is_symlink) { /* Sorry, no race free way to setxattr on symlink. */ @@ -2147,6 +2123,9 @@ static void setup_nofile_rlimit(void) static void log_func(enum fuse_log_level level, const char *fmt, va_list ap) { + if (current_log_level < level) + return; + if (use_syslog) { int priority =3D LOG_ERR; switch (level) { @@ -2227,8 +2206,17 @@ int main(int argc, char *argv[]) if (fuse_opt_parse(&args, &lo, lo_opts, NULL)=3D=3D -1) return 1; =20 + /* + * log_level is 0 if not configured via cmd options (0 is LOG_EMERG, + * and we don't use this log level). + */ + if (opts.log_level !=3D 0) + current_log_level =3D opts.log_level; lo.debug =3D opts.debug; + if (lo.debug) + current_log_level =3D FUSE_LOG_DEBUG; lo.root.refcount =3D 2; + if (lo.source) { struct stat stat; int res; --=20 2.23.0