From: Aneesh Kumar K.V Date: Fri, 19 Mar 2010 12:47:26 +0000 (+0000) Subject: fs/9p: Clunk the fid resulting from partial walk of the name X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=5b0fa207d1a6f27c9a2f2d707147dce01af21db7;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git fs/9p: Clunk the fid resulting from partial walk of the name Signed-off-by: Aneesh Kumar K.V Signed-off-by: Eric Van Hensbergen --- diff --git a/fs/9p/fid.c b/fs/9p/fid.c index 08b2eb157048..b0a23c7e736e 100644 --- a/fs/9p/fid.c +++ b/fs/9p/fid.c @@ -110,7 +110,7 @@ struct p9_fid *v9fs_fid_lookup(struct dentry *dentry) { 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; @@ -183,10 +183,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)) { + 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; } - + old_fid = fid; i += l; clone = 0; }