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

Commit 5cfdddcf authored by Pavel Shilovsky's avatar Pavel Shilovsky Committed by Steve French
Browse files

CIFS: Add missed forcemand mount option 



The 'forcemand' form of 'forcemandatorylock' mount option was missed
when the code moved to use the standard token parser. Return it back.

Also fix a comment style in the parser.

Signed-off-by: default avatarPavel Shilovsky <piastry@etersoft.ru>
Reviewed-by: default avatarJeff Layton <jlayton@redhat.com>
Signed-off-by: default avatarSteve French <sfrench@us.ibm.com>
parent 8f09c3d8

fs/cifs/connect.c

+5 −2
Original line number Diff line number Diff line
@@ -140,6 +140,7 @@ static const match_table_t cifs_mount_option_tokens = { 
	{ Opt_nobrl, "nobrl" },

	{ Opt_nobrl, "nolock" },

	{ Opt_forcemandatorylock, "forcemandatorylock" },

	{ Opt_forcemandatorylock, "forcemand" },

	{ Opt_setuids, "setuids" },

	{ Opt_nosetuids, "nosetuids" },

	{ Opt_dynperm, "dynperm" },
@@ -1326,9 +1327,11 @@ cifs_parse_mount_options(const char *mountdata, const char *devname, 
			break;

		case Opt_nobrl:

			vol->nobrl =  1;

			/* turn off mandatory locking in mode

			/*

			 * turn off mandatory locking in mode

			 * if remote locking is turned off since the

			 * local vfs will do advisory */

			 * local vfs will do advisory

			 */

			if (vol->file_mode ==

				(S_IALLUGO & ~(S_ISUID | S_IXGRP)))

				vol->file_mode = S_IALLUGO;