git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec...
[safe/jmp/linux-2.6]
/
fs
/
ocfs2
/
quota_global.c
diff --git
a/fs/ocfs2/quota_global.c
b/fs/ocfs2/quota_global.c
index
faaa4d0
..
04ae76d
100644
(file)
--- a/
fs/ocfs2/quota_global.c
+++ b/
fs/ocfs2/quota_global.c
@@
-3,6
+3,7
@@
*/
#include <linux/spinlock.h>
#include <linux/fs.h>
+#include <linux/slab.h>
#include <linux/quota.h>
#include <linux/quotaops.h>
#include <linux/dqblk_qtree.h>