Linux-NFS Archive on lore.kernel.org
 help / color / Atom feed
From: Steve Dickson <SteveD@RedHat.com>
To: NeilBrown <neilb@suse.de>
Cc: linux-nfs <linux-nfs@vger.kernel.org>
Subject: Re: [PATCH nfs-utils] conffile: Don't give warning for optional config files.
Date: Fri, 27 Mar 2020 15:16:29 -0400
Message-ID: <caecff75-cca3-53f4-ef7c-3b66bbd2ff11@RedHat.com> (raw)
In-Reply-To: <87imiq7586.fsf@notabene.neil.brown.name>



On 3/27/20 1:10 AM, NeilBrown wrote:
> 
> A recent commit added the possibility of optional config files for which
> warning messages would be suppressed.
> Unfortunately only one of the possible warning messages - the least
> likely one - was suppressed.
> 
> This patch suppresses the other.
> 
> Fixes: c6fdcbe0a5cf ("conffile: allow optional include files")
> Signed-off-by: NeilBrown <neilb@suse.de>
Committed... (tag: nfs-utils-2-4-4-rc2)

steved.
> ---
>  support/nfs/conffile.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> 
> That was careless - sorry.  I really have tested this time.
> NeilBrown
> 
> diff --git a/support/nfs/conffile.c b/support/nfs/conffile.c
> index d55bfe10120a..3d13610ee766 100644
> --- a/support/nfs/conffile.c
> +++ b/support/nfs/conffile.c
> @@ -429,9 +429,9 @@ conf_parse_line(int trans, char *line, const char *filename, int lineno, char **
>  
>  		subconf = conf_readfile(relpath);
>  		if (subconf == NULL) {
> -			xlog_warn("config error at %s:%d: "
> -				"error loading included config",
> -				  filename, lineno);
> +			if (!optional)
> +				xlog_warn("config error at %s:%d: error loading included config",
> +					  filename, lineno);
>  			if (relpath)
>  				free(relpath);
>  			return;
> 


      reply index

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-03-27  5:10 NeilBrown
2020-03-27 19:16 ` Steve Dickson [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=caecff75-cca3-53f4-ef7c-3b66bbd2ff11@RedHat.com \
    --to=steved@redhat.com \
    --cc=linux-nfs@vger.kernel.org \
    --cc=neilb@suse.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Linux-NFS Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-nfs/0 linux-nfs/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-nfs linux-nfs/ https://lore.kernel.org/linux-nfs \
		linux-nfs@vger.kernel.org
	public-inbox-index linux-nfs

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-nfs


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git