diff options
author | Jeff Layton <jlayton@redhat.com> | 2010-07-26 10:29:58 -0400 |
---|---|---|
committer | Steve French <sfrench@us.ibm.com> | 2010-08-02 08:40:40 -0400 |
commit | f636a34802e3913415410c6e595df2bf84851cff (patch) | |
tree | d5d54cff34c91603f2ba17075f22dc4b57267986 | |
parent | 3572d2857f61f720082740cc17e2d99b45e7af7f (diff) |
cifs: ignore the "mand", "nomand" and "_netdev" mount options
These are all handled by the userspace mount programs, but older versions
of mount.cifs also handed them off to the kernel. Ignore them.
Signed-off-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Steve French <sfrench@us.ibm.com>
-rw-r--r-- | fs/cifs/connect.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c index d91a6085d55c..85a994c6433d 100644 --- a/fs/cifs/connect.c +++ b/fs/cifs/connect.c | |||
@@ -1264,6 +1264,12 @@ cifs_parse_mount_options(char *options, const char *devname, | |||
1264 | } else if ((strnicmp(data, "nocase", 6) == 0) || | 1264 | } else if ((strnicmp(data, "nocase", 6) == 0) || |
1265 | (strnicmp(data, "ignorecase", 10) == 0)) { | 1265 | (strnicmp(data, "ignorecase", 10) == 0)) { |
1266 | vol->nocase = 1; | 1266 | vol->nocase = 1; |
1267 | } else if (strnicmp(data, "mand", 4) == 0) { | ||
1268 | /* ignore */ | ||
1269 | } else if (strnicmp(data, "nomand", 6) == 0) { | ||
1270 | /* ignore */ | ||
1271 | } else if (strnicmp(data, "_netdev", 7) == 0) { | ||
1272 | /* ignore */ | ||
1267 | } else if (strnicmp(data, "brl", 3) == 0) { | 1273 | } else if (strnicmp(data, "brl", 3) == 0) { |
1268 | vol->nobrl = 0; | 1274 | vol->nobrl = 0; |
1269 | } else if ((strnicmp(data, "nobrl", 5) == 0) || | 1275 | } else if ((strnicmp(data, "nobrl", 5) == 0) || |