From patchwork Wed Feb 17 20:18:36 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Dickson X-Patchwork-Id: 12092129 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=-15.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,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 4A135C433E0 for ; Wed, 17 Feb 2021 20:18:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0A34664E5F for ; Wed, 17 Feb 2021 20:18:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233510AbhBQUS3 (ORCPT ); Wed, 17 Feb 2021 15:18:29 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:36811 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232892AbhBQUS3 (ORCPT ); Wed, 17 Feb 2021 15:18:29 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1613593022; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=h9c5BclFX+SPBS367656804qkXT3YE+JsszvZYIVqtI=; b=ePfXFMFC1WcfrLU4UDkQl4Z0h8f8r0bRxk0Jp8BMrBlg+NFZI6OMITVkgt8ZaQB4NqKUQL 9JfWu6fD9yfpNpqtj0WzM1t41qdCtSNWd4QudJpVBYWS0moW2yxmfh9brI6n2XOeRwxEcR o/2798BgBsl2jSifPJ4oh3tyvVwYFhI= 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-567-sEtrPU1xPaSoWufjvmoTMQ-1; Wed, 17 Feb 2021 15:17:00 -0500 X-MC-Unique: sEtrPU1xPaSoWufjvmoTMQ-1 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 885E5107ACE6 for ; Wed, 17 Feb 2021 20:16:59 +0000 (UTC) Received: from madhat.home.dicksonnet.net (ovpn-112-108.phx2.redhat.com [10.3.112.108]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4295D19D6C for ; Wed, 17 Feb 2021 20:16:59 +0000 (UTC) From: Steve Dickson To: Linux NFS Mailing list Subject: [PATCH 1/1] nfs-utiles: rename xlog_from_conffile() to xlog_set_debug() Date: Wed, 17 Feb 2021 15:18:36 -0500 Message-Id: <20210217201836.95788-1-steved@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org Standardized how config setting are set as well as the rename Signed-off-by: Steve Dickson --- support/include/xlog.h | 2 +- support/nfs/xlog.c | 2 +- utils/exportfs/exportfs.c | 12 +++++++++--- utils/mountd/mountd.c | 9 +++------ utils/nfsd/nfsd.c | 11 +++++++++-- utils/nfsdcltrack/nfsdcltrack.c | 20 ++++++++++++-------- utils/statd/sm-notify.c | 7 ++++--- utils/statd/statd.c | 8 ++++---- 8 files changed, 43 insertions(+), 28 deletions(-) diff --git a/support/include/xlog.h b/support/include/xlog.h index 32ff5a1..69cdf61 100644 --- a/support/include/xlog.h +++ b/support/include/xlog.h @@ -51,7 +51,7 @@ void xlog_stderr(int on); void xlog_syslog(int on); void xlog_config(int fac, int on); void xlog_sconfig(char *, int on); -void xlog_from_conffile(char *); +void xlog_set_debug(char *); int xlog_enabled(int fac); void xlog(int fac, const char *fmt, ...) XLOG_FORMAT((printf, 2, 3)); void xlog_warn(const char *fmt, ...) XLOG_FORMAT((printf, 1, 2)); diff --git a/support/nfs/xlog.c b/support/nfs/xlog.c index 86acd6a..e5861b9 100644 --- a/support/nfs/xlog.c +++ b/support/nfs/xlog.c @@ -129,7 +129,7 @@ xlog_sconfig(char *kind, int on) } void -xlog_from_conffile(char *service) +xlog_set_debug(char *service) { struct conf_list *kinds; struct conf_list_node *n; diff --git a/utils/exportfs/exportfs.c b/utils/exportfs/exportfs.c index 9fcae0b..f8b446a 100644 --- a/utils/exportfs/exportfs.c +++ b/utils/exportfs/exportfs.c @@ -91,7 +91,12 @@ release_lockfile() _lockfd = -1; } } - +inline static void +read_exportfs_conf(void) +{ + conf_init_file(NFS_CONFFILE); + xlog_set_debug("exportfs"); +} int main(int argc, char **argv) { @@ -116,8 +121,9 @@ main(int argc, char **argv) xlog_stderr(1); xlog_syslog(0); - conf_init_file(NFS_CONFFILE); - xlog_from_conffile("exportfs"); + /* Read in config setting */ + read_exportfs_conf(); + nfsd_path_init(); /* NOTE: following uses "mountd" section of nfs.conf !!!! */ diff --git a/utils/mountd/mountd.c b/utils/mountd/mountd.c index a480265..612063b 100644 --- a/utils/mountd/mountd.c +++ b/utils/mountd/mountd.c @@ -666,13 +666,13 @@ int port = 0; int descriptors = 0; inline static void -read_mount_conf(char **argv) +read_mountd_conf(char **argv) { char *s; conf_init_file(NFS_CONFFILE); - xlog_from_conffile("mountd"); + xlog_set_debug("mountd"); manage_gids = conf_get_bool("mountd", "manage-gids", manage_gids); descriptors = conf_get_num("mountd", "descriptors", descriptors); port = conf_get_num("mountd", "port", port); @@ -684,9 +684,6 @@ read_mount_conf(char **argv) if (s && !state_setup_basedir(argv[0], s)) exit(1); - if ((s = conf_get_str("mountd", "debug")) != NULL) - xlog_sconfig(s, 1); - /* NOTE: following uses "nfsd" section of nfs.conf !!!! */ if (conf_get_bool("nfsd", "udp", NFSCTL_UDPISSET(_rpcprotobits))) NFSCTL_UDPSET(_rpcprotobits); @@ -726,7 +723,7 @@ main(int argc, char **argv) xlog_open(progname); /* Read in config setting */ - read_mount_conf(argv); + read_mountd_conf(argv); /* Parse the command line options and arguments. */ opterr = 0; diff --git a/utils/nfsd/nfsd.c b/utils/nfsd/nfsd.c index c9f0385..b074171 100644 --- a/utils/nfsd/nfsd.c +++ b/utils/nfsd/nfsd.c @@ -56,6 +56,13 @@ static struct option longopts[] = { NULL, 0, 0, 0 } }; +inline static void +read_nfsd_conf(void) +{ + conf_init_file(NFS_CONFFILE); + xlog_set_debug("nfsd"); +} + int main(int argc, char **argv) { @@ -81,8 +88,8 @@ main(int argc, char **argv) xlog_syslog(0); xlog_stderr(1); - conf_init_file(NFS_CONFFILE); - xlog_from_conffile("nfsd"); + /* Read in config setting */ + read_nfsd_conf(); nfssvc_get_minormask(&minormask); diff --git a/utils/nfsdcltrack/nfsdcltrack.c b/utils/nfsdcltrack/nfsdcltrack.c index b45a904..ee85167 100644 --- a/utils/nfsdcltrack/nfsdcltrack.c +++ b/utils/nfsdcltrack/nfsdcltrack.c @@ -549,7 +549,17 @@ find_cmd(char *cmdname) __func__, cmdname); return NULL; } +inline static void +read_nfsdcltrack_conf(void) +{ + char *val; + conf_init_file(NFS_CONFFILE); + xlog_set_debug("nfsdcltrack"); + val = conf_get_str("nfsdcltrack", "storagedir"); + if (val) + storagedir = val; +} int main(int argc, char **argv) { @@ -564,14 +574,8 @@ main(int argc, char **argv) xlog_syslog(1); xlog_stderr(0); - conf_init_file(NFS_CONFFILE); - xlog_from_conffile("nfsdcltrack"); - val = conf_get_str("nfsdcltrack", "storagedir"); - if (val) - storagedir = val; - rc = conf_get_num("nfsdcltrack", "debug", 0); - if (rc > 0) - xlog_config(D_ALL, 1); + /* Read in config setting */ + read_nfsdcltrack_conf(); /* process command-line options */ while ((arg = getopt_long(argc, argv, "hdfs:", longopts, diff --git a/utils/statd/sm-notify.c b/utils/statd/sm-notify.c index 739731f..606b912 100644 --- a/utils/statd/sm-notify.c +++ b/utils/statd/sm-notify.c @@ -482,12 +482,12 @@ nsm_lift_grace_period(void) return; } inline static void -read_nfsconf(char **argv) +read_smnotify_conf(char **argv) { char *s; conf_init_file(NFS_CONFFILE); - xlog_from_conffile("sm-notify"); + xlog_set_debug("sm-notify"); opt_max_retry = conf_get_num("sm-notify", "retry-time", opt_max_retry / 60) * 60; opt_srcport = conf_get_str("sm-notify", "outgoing-port"); opt_srcaddr = conf_get_str("sm-notify", "outgoing-addr"); @@ -512,7 +512,8 @@ main(int argc, char **argv) else progname = argv[0]; - read_nfsconf(argv); + /* Read in config setting */ + read_smnotify_conf(argv); while ((c = getopt(argc, argv, "dm:np:v:P:f")) != -1) { switch (c) { diff --git a/utils/statd/statd.c b/utils/statd/statd.c index e4a1df4..32169d4 100644 --- a/utils/statd/statd.c +++ b/utils/statd/statd.c @@ -243,12 +243,12 @@ int port = 0, out_port = 0; int nlm_udp = 0, nlm_tcp = 0; inline static void -read_nfsconf(char **argv) +read_statd_conf(char **argv) { char *s; conf_init_file(NFS_CONFFILE); - xlog_from_conffile("statd"); + xlog_set_debug("statd"); out_port = conf_get_num("statd", "outgoing-port", out_port); port = conf_get_num("statd", "port", port); @@ -306,8 +306,8 @@ int main (int argc, char **argv) /* Set hostname */ MY_NAME = NULL; - /* Read nfs.conf */ - read_nfsconf(argv); + /* Read in config setting */ + read_statd_conf(argv); /* Process command line switches */ while ((arg = getopt_long(argc, argv, "h?vVFNH:dn:p:o:P:LT:U:", longopts, NULL)) != EOF) {