Received-SPF: pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Subject: Re: [PATCH] mount: parse default values correctly
From:   Steve Dickson <SteveD@RedHat.com>
To:     Linux NFS Mailing list <linux-nfs@vger.kernel.org>
References: <20210106184028.150925-1-steved@redhat.com>
Message-ID: <3b8cecf2-3f15-a05d-13f0-2cc5b2d50c79@RedHat.com>
Date:   Thu, 7 Jan 2021 11:03:06 -0500
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101
 Thunderbird/78.6.0
MIME-Version: 1.0
In-Reply-To: <20210106184028.150925-1-steved@redhat.com>
Content-Type: text/plain; charset=utf-8
Content-Language: en-US
Content-Transfer-Encoding: 7bit
Precedence: bulk


On 1/6/21 1:40 PM, Steve Dickson wrote:
> Commit 88c22f92 converted the configfile.c routines
> to use the parse_opt interfaces which broke how
> default values from nfsmount.conf are managed.
> 
> Default values can not be added to the mount string
> handed to the kernel. They must be interpreted into
> the correct mount options then passed to the kernel.
> 
> Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1912877
> 
> Signed-off-by: Steve Dickson <steved@redhat.com>
Committed... (tag: nfs-utils-2-5-3-rc4)

steved.
> ---
>  utils/mount/configfile.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/utils/mount/configfile.c b/utils/mount/configfile.c
> index 7934f4f..e865998 100644
> --- a/utils/mount/configfile.c
> +++ b/utils/mount/configfile.c
> @@ -277,8 +277,10 @@ conf_parse_mntopts(char *section, char *arg, struct mount_options *options)
>  		}
>  		if (buf[0] == '\0')
>  			continue;
> +		if (default_value(buf))
> +			continue;
> +
>  		po_append(options, buf);
> -		default_value(buf);
>  	}
>  	conf_free_list(list);
>  }
>