diff options
| author |   Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2019-01-13 22:35:32 -0800 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2019-01-13 22:35:32 -0800 |
| commit | 4116941b7a703f8c770998bb3a59966608cb5bb2 (patch) | |
| tree | 32945b644b69e3fd1a9ba8cd7369cf62abc44ccd /include/linux/ceph/msgpool.h | |
| parent | Input: ad7879 - add check for read errors in interrupt (diff) | |
| parent | Linux 4.20 (diff) | |
Merge tag 'v4.20' into next
Merge with mainline to bring in the new APIs.
Diffstat (limited to 'include/linux/ceph/msgpool.h')
| -rw-r--r-- | include/linux/ceph/msgpool.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/include/linux/ceph/msgpool.h b/include/linux/ceph/msgpool.h index 76c98a512758..729cdf700eae 100644 --- a/include/linux/ceph/msgpool.h +++ b/include/linux/ceph/msgpool.h @@ -13,14 +13,15 @@ struct ceph_msgpool { mempool_t *pool; int type; /* preallocated message type */ int front_len; /* preallocated payload size */ + int max_data_items; }; -extern int ceph_msgpool_init(struct ceph_msgpool *pool, int type, - int front_len, int size, bool blocking, - const char *name); +int ceph_msgpool_init(struct ceph_msgpool *pool, int type, + int front_len, int max_data_items, int size, + const char *name); extern void ceph_msgpool_destroy(struct ceph_msgpool *pool); -extern struct ceph_msg *ceph_msgpool_get(struct ceph_msgpool *, - int front_len); +struct ceph_msg *ceph_msgpool_get(struct ceph_msgpool *pool, int front_len, + int max_data_items); extern void ceph_msgpool_put(struct ceph_msgpool *, struct ceph_msg *); #endif |