diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-11-03 09:12:36 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-11-03 09:12:36 +0100 |
commit | 51351ce724db653a8abeecb520dbff5d5195e73e (patch) | |
tree | 32d9c4f8dae54e4b9f70f567ddd5a25344f42e6d /net | |
parent | ca8b18a8267406447202ff24c703914293966091 (diff) | |
parent | 1836d95928a0f41ada0cbb2a6c4e46b027db9491 (diff) |
Merge branch 'linus' into auto-latest
Diffstat (limited to 'net')
-rw-r--r-- | net/9p/client.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/net/9p/client.c b/net/9p/client.c index 5bf5f227dbe0..8af95b2dddd6 100644 --- a/net/9p/client.c +++ b/net/9p/client.c @@ -582,11 +582,9 @@ static struct p9_fid *p9_fid_create(struct p9_client *clnt) memset(&fid->qid, 0, sizeof(struct p9_qid)); fid->mode = -1; - fid->rdir_fpos = 0; fid->uid = current_fsuid(); fid->clnt = clnt; - fid->aux = NULL; - + fid->rdir = NULL; spin_lock_irqsave(&clnt->lock, flags); list_add(&fid->flist, &clnt->fidlist); spin_unlock_irqrestore(&clnt->lock, flags); @@ -609,6 +607,7 @@ static void p9_fid_destroy(struct p9_fid *fid) spin_lock_irqsave(&clnt->lock, flags); list_del(&fid->flist); spin_unlock_irqrestore(&clnt->lock, flags); + kfree(fid->rdir); kfree(fid); } |