projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable
[linux-2.6-block.git]
/
fs
/
btrfs
/
ctree.c
diff --git
a/fs/btrfs/ctree.c
b/fs/btrfs/ctree.c
index babf7fbaec8484217393a94b2920e0f4c7b0aae7..6795a713b2052bbd7560590dccbba8b33ca6c717 100644
(file)
--- a/
fs/btrfs/ctree.c
+++ b/
fs/btrfs/ctree.c
@@
-17,6
+17,7
@@
*/
#include <linux/sched.h>
+#include <linux/slab.h>
#include "ctree.h"
#include "disk-io.h"
#include "transaction.h"