9pnet: refactor struct p9_fcall alloc code

Signed-off-by: Simon Derr <simon.derr@bull.net>
Signed-off-by: Eric Van Hensbergen <ericvh@gmail.com>
This commit is contained in:
Simon Derr 2013-06-21 15:32:36 +02:00 committed by Eric Van Hensbergen
parent 17b6fd9d6d
commit 5387320d48
1 changed files with 18 additions and 17 deletions

View File

@ -204,6 +204,17 @@ free_and_return:
return ret;
}
struct p9_fcall *p9_fcall_alloc(int alloc_msize)
{
struct p9_fcall *fc;
fc = kmalloc(sizeof(struct p9_fcall) + alloc_msize, GFP_NOFS);
if (!fc)
return NULL;
fc->capacity = alloc_msize;
fc->sdata = (char *) fc + sizeof(struct p9_fcall);
return fc;
}
/**
* p9_tag_alloc - lookup/allocate a request by tag
* @c: client session to lookup tag within
@ -256,29 +267,19 @@ p9_tag_alloc(struct p9_client *c, u16 tag, unsigned int max_size)
col = tag % P9_ROW_MAXTAG;
req = &c->reqs[row][col];
if (!req->tc) {
if (!req->wq) {
req->wq = kmalloc(sizeof(wait_queue_head_t), GFP_NOFS);
if (!req->wq)
goto grow_failed;
init_waitqueue_head(req->wq);
req->tc = kmalloc(sizeof(struct p9_fcall) + alloc_msize,
GFP_NOFS);
if (!req->tc)
goto grow_failed;
req->tc->capacity = alloc_msize;
req->tc->sdata = (char *) req->tc + sizeof(struct p9_fcall);
}
if (!req->rc) {
req->rc = kmalloc(sizeof(struct p9_fcall) + alloc_msize,
GFP_NOFS);
if (!req->rc)
goto grow_failed;
req->rc->capacity = alloc_msize;
req->rc->sdata = (char *) req->rc + sizeof(struct p9_fcall);
}
if (!req->tc)
req->tc = p9_fcall_alloc(alloc_msize);
if (!req->rc)
req->rc = p9_fcall_alloc(alloc_msize);
if (!req->tc || !req->rc)
goto grow_failed;
p9pdu_reset(req->tc);
p9pdu_reset(req->rc);