2008-04-11 20:29:00

by Chuck Lever III

[permalink] [raw]
Subject: [PATCH] NFS: Only warn on unrecognized mount options

To provide compatibility with automounters who use a common set of mount
options for all file systems, change the NFS in-kernel mount option parser
to ignore mount options it doesn't recognize.

Signed-off-by: Chuck Lever <[email protected]>
---
Take 2.

fs/nfs/super.c | 7 ++-----
1 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/fs/nfs/super.c b/fs/nfs/super.c
index f921902..cbf2b37 100644
--- a/fs/nfs/super.c
+++ b/fs/nfs/super.c
@@ -1044,7 +1044,8 @@ static int nfs_parse_mount_options(char *raw,
break;

default:
- goto out_unknown;
+ dfprintk(MOUNT, "NFS: unrecognized mount option '%s'"
+ " ignored\n", p);
}
}

@@ -1070,10 +1071,6 @@ out_unrec_xprt:
out_unrec_sec:
printk(KERN_INFO "NFS: unrecognized security flavor\n");
return 0;
-
-out_unknown:
- printk(KERN_INFO "NFS: unknown mount option: %s\n", p);
- return 0;
}

/*