git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ARM: 6145/1: ux500 MTU clockrate correction
[safe/jmp/linux-2.6]
/
fs
/
9p
/
fid.c
diff --git
a/fs/9p/fid.c
b/fs/9p/fid.c
index
82ee460
..
7317b39
100644
(file)
--- a/
fs/9p/fid.c
+++ b/
fs/9p/fid.c
@@
-111,7
+111,7
@@
struct p9_fid *v9fs_fid_lookup(struct dentry *dentry)
{
int i, n, l, clone, any, access;
u32 uid;
{
int i, n, l, clone, any, access;
u32 uid;
- struct p9_fid *fid;
+ struct p9_fid *fid
, *old_fid = NULL
;
struct dentry *d, *ds;
struct v9fs_session_info *v9ses;
char **wnames, *uname;
struct dentry *d, *ds;
struct v9fs_session_info *v9ses;
char **wnames, *uname;
@@
-184,10
+184,18
@@
struct p9_fid *v9fs_fid_lookup(struct dentry *dentry)
l = min(n - i, P9_MAXWELEM);
fid = p9_client_walk(fid, l, &wnames[i], clone);
if (IS_ERR(fid)) {
l = min(n - i, P9_MAXWELEM);
fid = p9_client_walk(fid, l, &wnames[i], clone);
if (IS_ERR(fid)) {
+ if (old_fid) {
+ /*
+ * If we fail, clunk fid which are mapping
+ * to path component and not the last component
+ * of the path.
+ */
+ p9_client_clunk(old_fid);
+ }
kfree(wnames);
return fid;
}
kfree(wnames);
return fid;
}
-
+ old_fid = fid;
i += l;
clone = 0;
}
i += l;
clone = 0;
}