diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-05 16:25:24 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-05 16:25:24 -0500 |
commit | b13d3c6e8ab6ac53e8c1858a9c837cb6ba3bbef0 (patch) | |
tree | 4c0b6cba4975b0d7871096e0a99406d450b0272f /fs/9p/fid.c | |
parent | e213e26ab3988c516c06eba4dcd030ac052f6dc9 (diff) | |
parent | 5717144a01d701614cfdb15f09ed562d720cf3db (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs:
fs/9p: Add hardlink support to .u extension
9P2010.L handshake: .L protocol negotiation
9P2010.L handshake: Remove "dotu" variable
9P2010.L handshake: Add mount option
9P2010.L handshake: Add VFS flags
net/9p: Handle mount errors correctly.
net/9p: Remove MAX_9P_CHAN limit
net/9p: Add multi channel support.
Diffstat (limited to 'fs/9p/fid.c')
-rw-r--r-- | fs/9p/fid.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/9p/fid.c b/fs/9p/fid.c index 14d944204571..08b2eb157048 100644 --- a/fs/9p/fid.c +++ b/fs/9p/fid.c | |||
@@ -151,7 +151,7 @@ struct p9_fid *v9fs_fid_lookup(struct dentry *dentry) | |||
151 | if (access == V9FS_ACCESS_SINGLE) | 151 | if (access == V9FS_ACCESS_SINGLE) |
152 | return ERR_PTR(-EPERM); | 152 | return ERR_PTR(-EPERM); |
153 | 153 | ||
154 | if (v9fs_extended(v9ses)) | 154 | if (v9fs_proto_dotu(v9ses)) |
155 | uname = NULL; | 155 | uname = NULL; |
156 | else | 156 | else |
157 | uname = v9ses->uname; | 157 | uname = v9ses->uname; |