Merge branch 'master' into export-slabh

[sfrench/cifs-2.6.git] / fs / logfs / segment.c

diff --git a/fs/logfs/segment.c b/fs/logfs/segment.c
index 0ecd8f07c11e466b531d002fd8d2aa0900983098..801a3a141625463cda2b5ee1ef29bdd8cdf5ab2f 100644 (file)
--- a/fs/logfs/segment.c
+++ b/fs/logfs/segment.c
@@ -10,6 +10,7 @@
  * three kinds of objects: inodes, dentries and blocks, both data and indirect.
  */
 #include "logfs.h"
+#include <linux/slab.h>
 
 static int logfs_mark_segment_bad(struct super_block *sb, u32 segno)
 {