projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[cascardo/linux.git]
/
fs
/
ceph
/
osdmap.c
diff --git
a/fs/ceph/osdmap.c
b/fs/ceph/osdmap.c
index
d82fe87
..
21c6623
100644
(file)
--- a/
fs/ceph/osdmap.c
+++ b/
fs/ceph/osdmap.c
@@
-1,4
+1,7
@@
+#include "ceph_debug.h"
+
+#include <linux/slab.h>
#include <asm/div64.h>
#include "super.h"
@@
-6,7
+9,6
@@
#include "crush/hash.h"
#include "crush/mapper.h"
#include "decode.h"
-#include "ceph_debug.h"
char *ceph_osdmap_state_str(char *str, int len, int state)
{