diff options
author | Venkateswararao Jujjuri (JV) <jvrao@linux.vnet.ibm.com> | 2011-01-14 18:24:59 -0500 |
---|---|---|
committer | Eric Van Hensbergen <ericvh@gmail.com> | 2011-03-15 10:57:34 -0400 |
commit | 9332685dffed3b402816c3564342f3e2df0c83ef (patch) | |
tree | febdf1c82bc921479932cb1baae979348c0ff276 /fs | |
parent | d344b0fb72e00339625464c5a29711906fa70b8b (diff) |
[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>
Diffstat (limited to 'fs')
-rw-r--r-- | fs/9p/v9fs.c | 6 |
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) | |||
198 | v9ses->flags |= V9FS_ACCESS_CLIENT; | 198 | v9ses->flags |= V9FS_ACCESS_CLIENT; |
199 | #else | 199 | #else |
200 | P9_DPRINTK(P9_DEBUG_ERROR, | 200 | P9_DPRINTK(P9_DEBUG_ERROR, |
201 | "access=client option not supported\n"); | 201 | "Not defined CONFIG_9P_FS_POSIX_ACL. " |
202 | kfree(s); | 202 | "Ignoring access=client option\n"); |
203 | ret = -EINVAL; | ||
204 | goto free_and_return; | ||
205 | #endif | 203 | #endif |
206 | } else { | 204 | } else { |
207 | v9ses->flags |= V9FS_ACCESS_SINGLE; | 205 | v9ses->flags |= V9FS_ACCESS_SINGLE; |