git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph...
[sfrench/cifs-2.6.git]
/
fs
/
ceph
/
snap.c
diff --git
a/fs/ceph/snap.c
b/fs/ceph/snap.c
index d197431532c0003d72d648e794c7294a35be6558..2b881262ef6727d15737341bb8b0af14c35ebd96 100644
(file)
--- a/
fs/ceph/snap.c
+++ b/
fs/ceph/snap.c
@@
-1,6
+1,7
@@
#include "ceph_debug.h"
#include <linux/sort.h>
+#include <linux/slab.h>
#include "super.h"
#include "decode.h"