lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ceph: all allocation functions should get gfp_mask

Browse Source 
This is essential, as for the rados block device we'll need
to run in different contexts that would need flags that
are other than GFP_NOFS.

Signed-off-by: Yehuda Sadeh <yehuda@hq.newdream.net>
Signed-off-by: Sage Weil <sage@newdream.net>
This commit is contained in:
Yehuda Sadeh
2010-04-06 14:33:58 -07:00
committed by Sage Weil
parent 23804d91f1
commit 34d23762d9
8 changed files with 32 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
fs/ceph/msgpool.c
View File

@@ -12,7 +12,7 @@ static void *alloc_fn(gfp_t gfp_mask, void *arg)
struct ceph_msgpool *pool = arg;
void *p;
p = ceph_msg_new(0, pool->front_len);
p = ceph_msg_new(0, pool->front_len, gfp_mask);
if (!p)
pr_err("msgpool %s alloc failed\n", pool->name);
return p;
@@ -48,7 +48,7 @@ struct ceph_msg *ceph_msgpool_get(struct ceph_msgpool *pool,
WARN_ON(1);
/* try to alloc a fresh message */
return ceph_msg_new(0, front_len);
return ceph_msg_new(0, front_len, GFP_NOFS);
}
return mempool_alloc(pool->pool, GFP_NOFS);