From 301fe50ca2576291a427de46ca6ed64d4949713e Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 21 Feb 2011 17:52:13 +0100 Subject: [PATCH] mount: ignore unknown mount options when remounting NFS mounts Don't fail on unknown nfs mount options. The kernel automatically adds a few mount options that we don't currently handle, like: sec=null|sys|krb5.. mountaddr= mountproto=tcp|udp local_lock=none|all|flock|posix Which causes a simple mount -o remount,rw to fail. Signed-off-by: Peter Korsgaard Signed-off-by: Denys Vlasenko --- util-linux/mount.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/util-linux/mount.c b/util-linux/mount.c index bc5285052..0baa74c7c 100644 --- a/util-linux/mount.c +++ b/util-linux/mount.c @@ -1129,6 +1129,9 @@ static NOINLINE int nfsmount(struct mntent *mp, long vfsflags, char *filteropts) continue; case 20: // "addr" - ignore continue; + case -1: // unknown + if (vfsflags & MS_REMOUNT) + continue; } val = xatoi_positive(opteq); -- 2.25.1