From d7d403763831374ae28c657a65a5d2cd92d252e1 Mon Sep 17 00:00:00 2001 From: "Aneesh Kumar K.V" Date: Tue, 1 Jun 2010 09:26:18 +0000 Subject: [PATCH] --- yaml --- r: 201786 b: refs/heads/master c: 9ffaf63e34821ea60b2e1c8593f968d73728f82b h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/9p/fid.c | 3 ++- trunk/fs/9p/v9fs.c | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 40d3c7e3f152..bcfe6c84afcc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 69d4b4436b54c1a850d475697fda5ca117b09a5e +refs/heads/master: 9ffaf63e34821ea60b2e1c8593f968d73728f82b diff --git a/trunk/fs/9p/fid.c b/trunk/fs/9p/fid.c index 7317b39b2815..5d6cfcbf73e7 100644 --- a/trunk/fs/9p/fid.c +++ b/trunk/fs/9p/fid.c @@ -152,7 +152,8 @@ struct p9_fid *v9fs_fid_lookup(struct dentry *dentry) if (access == V9FS_ACCESS_SINGLE) return ERR_PTR(-EPERM); - if (v9fs_proto_dotu(v9ses)) + if (v9fs_proto_dotu(v9ses) || + v9fs_proto_dotl(v9ses)) uname = NULL; else uname = v9ses->uname; diff --git a/trunk/fs/9p/v9fs.c b/trunk/fs/9p/v9fs.c index f8b86e92cd66..3c492011221c 100644 --- a/trunk/fs/9p/v9fs.c +++ b/trunk/fs/9p/v9fs.c @@ -278,7 +278,7 @@ struct p9_fid *v9fs_session_init(struct v9fs_session_info *v9ses, v9ses->maxdata = v9ses->clnt->msize - P9_IOHDRSZ; /* for legacy mode, fall back to V9FS_ACCESS_ANY */ - if (!v9fs_proto_dotu(v9ses) && + if (!(v9fs_proto_dotu(v9ses) || v9fs_proto_dotl(v9ses)) && ((v9ses->flags&V9FS_ACCESS_MASK) == V9FS_ACCESS_USER)) { v9ses->flags &= ~V9FS_ACCESS_MASK;