ceph: all allocation functions should get gfp_mask

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>

1 files changed, 2 insertions, 2 deletions

diff --git a/fs/ceph/msgpool.c b/fs/ceph/msgpool.c
index 50fe5cc5de76..dd65a6438131 100644
--- a/fs/ceph/msgpool.c
+++ b/fs/ceph/msgpool.c
@@ -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);