From 6cea2959ca150d9e60b9c3d7ad1d1469b08239b1 Mon Sep 17 00:00:00 2001 From: Roel Kluin Date: Tue, 28 Oct 2008 14:22:43 -0500 Subject: [PATCH] --- yaml --- r: 118488 b: refs/heads/master c: 9f3e9bbe62b0bdbbaa7c689a68a22a7d3c1670f0 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/9p/client.c | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index fa847ab34802..28b1a951cc8b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1558c6214904c636d5a37f05f84202d6cdd9cff8 +refs/heads/master: 9f3e9bbe62b0bdbbaa7c689a68a22a7d3c1670f0 diff --git a/trunk/net/9p/client.c b/trunk/net/9p/client.c index b56d808e63a9..6e800dd51f09 100644 --- a/trunk/net/9p/client.c +++ b/trunk/net/9p/client.c @@ -608,7 +608,7 @@ p9_client_rpc(struct p9_client *c, int8_t type, const char *fmt, ...) static struct p9_fid *p9_fid_create(struct p9_client *clnt) { - int err; + int ret; struct p9_fid *fid; unsigned long flags; @@ -617,11 +617,12 @@ static struct p9_fid *p9_fid_create(struct p9_client *clnt) if (!fid) return ERR_PTR(-ENOMEM); - fid->fid = p9_idpool_get(clnt->fidpool); + ret = p9_idpool_get(clnt->fidpool); if (fid->fid < 0) { - err = -ENOSPC; + ret = -ENOSPC; goto error; } + fid->fid = ret; memset(&fid->qid, 0, sizeof(struct p9_qid)); fid->mode = -1; @@ -638,7 +639,7 @@ static struct p9_fid *p9_fid_create(struct p9_client *clnt) error: kfree(fid); - return ERR_PTR(err); + return ERR_PTR(ret); } static void p9_fid_destroy(struct p9_fid *fid)