From 9c0d1b373fae202c013bef2e59835120e167bcf9 Mon Sep 17 00:00:00 2001 From: Jeff Layton Date: Tue, 27 Jul 2010 07:33:51 -0400 Subject: mount.cifs: ignore the "_netdev" mount option This mount options is used to clue in init scripts that the filesystem shouldn't be mounted until networking is available. /bin/mount also passes that option to the filesystem however, and cifs currently chokes on it. mount.nfs ignores this option -- have mount.cifs do the same. Signed-off-by: Jeff Layton --- mount.cifs.c | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'mount.cifs.c') diff --git a/mount.cifs.c b/mount.cifs.c index c84e72d..27d267c 100644 --- a/mount.cifs.c +++ b/mount.cifs.c @@ -133,6 +133,7 @@ * Values for parsing command line options. */ #define OPT_ERROR -1 +#define OPT_IGNORE 0 #define OPT_USERS 1 #define OPT_USER 2 #define OPT_USER_XATTR 3 @@ -836,6 +837,8 @@ static int parse_opt_token(const char *token) return OPT_RW; if (strncmp(token, "remount", 7) == 0) return OPT_REMOUNT; + if (strncmp(token, "_netdev", 7) == 0) + return OPT_IGNORE; return OPT_ERROR; } @@ -1128,6 +1131,8 @@ parse_options(const char *data, struct parsed_mount_info *parsed_info) case OPT_REMOUNT: *filesys_flags |= MS_REMOUNT; break; + case OPT_IGNORE: + goto nocopy; } /* check size before copying option to buffer */ -- cgit v1.2.3