summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVenkateswararao Jujjuri (JV) <jvrao@linux.vnet.ibm.com>2011-01-15 02:24:59 +0300
committerEric Van Hensbergen <ericvh@gmail.com>2011-03-15 17:57:34 +0300
commit9332685dffed3b402816c3564342f3e2df0c83ef (patch)
treefebdf1c82bc921479932cb1baae979348c0ff276
parentd344b0fb72e00339625464c5a29711906fa70b8b (diff)
downloadlinux-9332685dffed3b402816c3564342f3e2df0c83ef.tar.xz
[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: Venkateswararao Jujjuri <jvrao@linux.vnet.ibm.com> Signed-off-by: Eric Van Hensbergen <ericvh@gmail.com>
-rw-r--r--fs/9p/v9fs.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/fs/9p/v9fs.c b/fs/9p/v9fs.c
index 2f77cd33ba83..d34f2937df66 100644
--- a/fs/9p/v9fs.c
+++ b/fs/9p/v9fs.c
@@ -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;