diff options
author | Ilya Dryomov <idryomov@gmail.com> | 2016-06-07 15:57:15 -0400 |
---|---|---|
committer | Ilya Dryomov <idryomov@gmail.com> | 2016-07-27 20:55:35 -0400 |
commit | b2aa5d0bc86cb901cc6c8737cfff66360cbff00c (patch) | |
tree | 317ea3ba399ae9eb004b6552cddeb561190101ec | |
parent | 523d939ef98fd712632d93a5a2b588e477a7565e (diff) |
libceph: fix some missing includes
- decode.h needs slab.h for kmalloc()
- osd_client.h needs msgpool.h for struct ceph_msgpool
- msgpool.h doesn't need messenger.h
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
-rw-r--r-- | include/linux/ceph/decode.h | 1 | ||||
-rw-r--r-- | include/linux/ceph/msgpool.h | 1 | ||||
-rw-r--r-- | include/linux/ceph/osd_client.h | 1 | ||||
-rw-r--r-- | net/ceph/msgpool.c | 1 |
4 files changed, 3 insertions, 1 deletions
diff --git a/include/linux/ceph/decode.h b/include/linux/ceph/decode.h index 19e9932f3e77..e83f3c81ef43 100644 --- a/include/linux/ceph/decode.h +++ b/include/linux/ceph/decode.h | |||
@@ -3,6 +3,7 @@ | |||
3 | 3 | ||
4 | #include <linux/err.h> | 4 | #include <linux/err.h> |
5 | #include <linux/bug.h> | 5 | #include <linux/bug.h> |
6 | #include <linux/slab.h> | ||
6 | #include <linux/time.h> | 7 | #include <linux/time.h> |
7 | #include <asm/unaligned.h> | 8 | #include <asm/unaligned.h> |
8 | 9 | ||
diff --git a/include/linux/ceph/msgpool.h b/include/linux/ceph/msgpool.h index 4b0d38960726..ddd0d48d0384 100644 --- a/include/linux/ceph/msgpool.h +++ b/include/linux/ceph/msgpool.h | |||
@@ -2,7 +2,6 @@ | |||
2 | #define _FS_CEPH_MSGPOOL | 2 | #define _FS_CEPH_MSGPOOL |
3 | 3 | ||
4 | #include <linux/mempool.h> | 4 | #include <linux/mempool.h> |
5 | #include <linux/ceph/messenger.h> | ||
6 | 5 | ||
7 | /* | 6 | /* |
8 | * we use memory pools for preallocating messages we may receive, to | 7 | * we use memory pools for preallocating messages we may receive, to |
diff --git a/include/linux/ceph/osd_client.h b/include/linux/ceph/osd_client.h index 1b3b6e155392..858932304260 100644 --- a/include/linux/ceph/osd_client.h +++ b/include/linux/ceph/osd_client.h | |||
@@ -9,6 +9,7 @@ | |||
9 | #include <linux/ceph/types.h> | 9 | #include <linux/ceph/types.h> |
10 | #include <linux/ceph/osdmap.h> | 10 | #include <linux/ceph/osdmap.h> |
11 | #include <linux/ceph/messenger.h> | 11 | #include <linux/ceph/messenger.h> |
12 | #include <linux/ceph/msgpool.h> | ||
12 | #include <linux/ceph/auth.h> | 13 | #include <linux/ceph/auth.h> |
13 | #include <linux/ceph/pagelist.h> | 14 | #include <linux/ceph/pagelist.h> |
14 | 15 | ||
diff --git a/net/ceph/msgpool.c b/net/ceph/msgpool.c index ddec1c10ac80..aaed59a47b1d 100644 --- a/net/ceph/msgpool.c +++ b/net/ceph/msgpool.c | |||
@@ -5,6 +5,7 @@ | |||
5 | #include <linux/types.h> | 5 | #include <linux/types.h> |
6 | #include <linux/vmalloc.h> | 6 | #include <linux/vmalloc.h> |
7 | 7 | ||
8 | #include <linux/ceph/messenger.h> | ||
8 | #include <linux/ceph/msgpool.h> | 9 | #include <linux/ceph/msgpool.h> |
9 | 10 | ||
10 | static void *msgpool_alloc(gfp_t gfp_mask, void *arg) | 11 | static void *msgpool_alloc(gfp_t gfp_mask, void *arg) |