[fs/9p] Ignore acl mount option when CONFIG_9P_FS_POSIX_ACL is not defined.
authorVenkateswararao Jujjuri (JV) <jvrao@linux.vnet.ibm.com>
Fri, 14 Jan 2011 23:24:59 +0000 (15:24 -0800)
committerEric Van Hensbergen <ericvh@gmail.com>
Tue, 15 Mar 2011 14:57:34 +0000 (09:57 -0500)
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>
fs/9p/v9fs.c

index 2f77cd33ba836d83c00e889294babb1905cc62a8..d34f2937df6695ab3fd46976206ca3db239290d5 100644 (file)
@@ -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;