Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f636a348 authored by Jeff Layton's avatar Jeff Layton Committed by Steve French
Browse files

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: default avatarJeff Layton <jlayton@redhat.com>
Signed-off-by: default avatarSteve French <sfrench@us.ibm.com>
parent 3572d285

fs/cifs/connect.c

+6 −0
Original line number Diff line number Diff line
@@ -1264,6 +1264,12 @@ cifs_parse_mount_options(char *options, const char *devname, 
		} else if ((strnicmp(data, "nocase", 6) == 0) ||

			   (strnicmp(data, "ignorecase", 10)  == 0)) {

			vol->nocase = 1;

		} else if (strnicmp(data, "mand", 4) == 0) {

			/* ignore */

		} else if (strnicmp(data, "nomand", 6) == 0) {

			/* ignore */

		} else if (strnicmp(data, "_netdev", 7) == 0) {

			/* ignore */

		} else if (strnicmp(data, "brl", 3) == 0) {

			vol->nobrl =  0;

		} else if ((strnicmp(data, "nobrl", 5) == 0) ||