From f469f1f10ad75d106cb803031a0192b98ed62495 Mon Sep 17 00:00:00 2001
From: "Venkateswararao Jujjuri (JV)" <jvrao@linux.vnet.ibm.com>
Date: Fri, 14 Jan 2011 15:24:59 -0800
Subject: [PATCH] --- yaml --- r: 235007 b: refs/heads/master c:
 9332685dffed3b402816c3564342f3e2df0c83ef h: refs/heads/master i:   235005:
 f85805d4f9d60389d1c80f05efb505c960027b34   235003:
 de0e4eae0e78f4e3aef0dc6051849f84ae1d0d3a   234999:
 a451c4a6fe8fd8a4bb018c07ca7c1350ec7fe6e2   234991:
 99b9f5e62303ca576af656e5415f8ed656cd9d80   234975:
 c9d9bd1aa6e441b9be5307691635597d2b15558d   234943:
 a94e19127b339afb171c033215a5c31b5ec026d0   234879:
 e39006e3ef7178196026ee5ef8452b682f1ddada   234751:
 5f788bbcd8f6dca841e323c0b34ed9a8663678c3   234495:
 17e522513e3f851e47435721b330b74bd722ee84 v: v3

---
 [refs]             | 2 +-
 trunk/fs/9p/v9fs.c | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 6b073d57e1f1..f5ed3ce45fb4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d344b0fb72e00339625464c5a29711906fa70b8b
+refs/heads/master: 9332685dffed3b402816c3564342f3e2df0c83ef
diff --git a/trunk/fs/9p/v9fs.c b/trunk/fs/9p/v9fs.c
index 2f77cd33ba83..d34f2937df66 100644
--- a/trunk/fs/9p/v9fs.c
+++ b/trunk/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;