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

Commit 9332685d authored by Venkateswararao Jujjuri (JV)'s avatar Venkateswararao Jujjuri (JV) Committed by Eric Van Hensbergen
Browse files

[fs/9p] Ignore acl mount option when CONFIG_9P_FS_POSIX_ACL is not defined. 



If the kernel is not compiled with CONFIG_9P_FS_POSIX_ACL and the
mount option is specified to enable ACLs current code fails the mount.
This patch brings the behavior inline with other filesystems like ext3
by proceeding with the mount and log a warning to syslog.

Signed-off-by: default avatarVenkateswararao Jujjuri <jvrao@linux.vnet.ibm.com>
Signed-off-by: default avatarEric Van Hensbergen <ericvh@gmail.com>
parent d344b0fb

fs/9p/v9fs.c

+2 −4
Original line number Diff line number Diff line
@@ -198,10 +198,8 @@ static int v9fs_parse_options(struct v9fs_session_info *v9ses, char *opts) 
				v9ses->flags |= V9FS_ACCESS_CLIENT;

#else

				P9_DPRINTK(P9_DEBUG_ERROR,

					"access=client option not supported\n");

				kfree(s);

				ret = -EINVAL;

				goto free_and_return;

					"Not defined CONFIG_9P_FS_POSIX_ACL. "

					"Ignoring access=client option\n");

#endif

			} else {

				v9ses->flags |= V9FS_ACCESS_SINGLE;