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;
From:   Steve Dickson <steved@redhat.com>
To:     Linux NFS Mailing list <linux-nfs@vger.kernel.org>
Subject: [PATCH] mount: parse default values correctly
Date:   Wed,  6 Jan 2021 13:40:28 -0500
Message-Id: <20210106184028.150925-1-steved@redhat.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Precedence: bulk

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>
---
 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);
 }
-- 
2.29.2