.. | .. |
---|
14 | 14 | struct ceph_msgpool *pool = arg; |
---|
15 | 15 | struct ceph_msg *msg; |
---|
16 | 16 | |
---|
17 | | - msg = ceph_msg_new(pool->type, pool->front_len, gfp_mask, true); |
---|
| 17 | + msg = ceph_msg_new2(pool->type, pool->front_len, pool->max_data_items, |
---|
| 18 | + gfp_mask, true); |
---|
18 | 19 | if (!msg) { |
---|
19 | 20 | dout("msgpool_alloc %s failed\n", pool->name); |
---|
20 | 21 | } else { |
---|
.. | .. |
---|
35 | 36 | } |
---|
36 | 37 | |
---|
37 | 38 | int ceph_msgpool_init(struct ceph_msgpool *pool, int type, |
---|
38 | | - int front_len, int size, bool blocking, const char *name) |
---|
| 39 | + int front_len, int max_data_items, int size, |
---|
| 40 | + const char *name) |
---|
39 | 41 | { |
---|
40 | 42 | dout("msgpool %s init\n", name); |
---|
41 | 43 | pool->type = type; |
---|
42 | 44 | pool->front_len = front_len; |
---|
| 45 | + pool->max_data_items = max_data_items; |
---|
43 | 46 | pool->pool = mempool_create(size, msgpool_alloc, msgpool_free, pool); |
---|
44 | 47 | if (!pool->pool) |
---|
45 | 48 | return -ENOMEM; |
---|
.. | .. |
---|
53 | 56 | mempool_destroy(pool->pool); |
---|
54 | 57 | } |
---|
55 | 58 | |
---|
56 | | -struct ceph_msg *ceph_msgpool_get(struct ceph_msgpool *pool, |
---|
57 | | - int front_len) |
---|
| 59 | +struct ceph_msg *ceph_msgpool_get(struct ceph_msgpool *pool, int front_len, |
---|
| 60 | + int max_data_items) |
---|
58 | 61 | { |
---|
59 | 62 | struct ceph_msg *msg; |
---|
60 | 63 | |
---|
61 | | - if (front_len > pool->front_len) { |
---|
62 | | - dout("msgpool_get %s need front %d, pool size is %d\n", |
---|
63 | | - pool->name, front_len, pool->front_len); |
---|
64 | | - WARN_ON(1); |
---|
| 64 | + if (front_len > pool->front_len || |
---|
| 65 | + max_data_items > pool->max_data_items) { |
---|
| 66 | + pr_warn_ratelimited("%s need %d/%d, pool %s has %d/%d\n", |
---|
| 67 | + __func__, front_len, max_data_items, pool->name, |
---|
| 68 | + pool->front_len, pool->max_data_items); |
---|
| 69 | + WARN_ON_ONCE(1); |
---|
65 | 70 | |
---|
66 | 71 | /* try to alloc a fresh message */ |
---|
67 | | - return ceph_msg_new(pool->type, front_len, GFP_NOFS, false); |
---|
| 72 | + return ceph_msg_new2(pool->type, front_len, max_data_items, |
---|
| 73 | + GFP_NOFS, false); |
---|
68 | 74 | } |
---|
69 | 75 | |
---|
70 | 76 | msg = mempool_alloc(pool->pool, GFP_NOFS); |
---|
.. | .. |
---|
80 | 86 | msg->front.iov_len = pool->front_len; |
---|
81 | 87 | msg->hdr.front_len = cpu_to_le32(pool->front_len); |
---|
82 | 88 | |
---|
| 89 | + msg->data_length = 0; |
---|
| 90 | + msg->num_data_items = 0; |
---|
| 91 | + |
---|
83 | 92 | kref_init(&msg->kref); /* retake single ref */ |
---|
84 | 93 | mempool_free(msg, pool->pool); |
---|
85 | 94 | } |
---|