Fix compile brekage with !CONFIG_BLOCK
authorIngo Molnar <mingo@elte.hu>
Thu, 28 Oct 2010 14:39:24 +0000 (16:39 +0200)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 28 Oct 2010 16:02:15 +0000 (09:02 -0700)
Today's git tree fails to build on !CONFIG_BLOCK, due to upstream commit
367a51a33902 ("fs: Add FITRIM ioctl"):

 include/linux/fs.h:36: error: expected specifier-qualifier-list before ‘uint64_t’
 include/linux/fs.h:36: error: expected specifier-qualifier-list before ‘uint64_t’
 include/linux/fs.h:36: error: expected specifier-qualifier-list before ‘uint64_t’

The commit adds uint64_t type usage to fs.h, but linux/types.h is not included
explicitly - it's only included implicitly via linux/blk_types.h, and there only if
CONFIG_BLOCK is enabled.

Add the explicit #include to fix this.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
include/linux/fs.h

index 6ed7ace74b7cedf08f539c6b5c0e4412471dad2e..1c73b50e81ffbb2f67014e93fdbc0143a414b7ff 100644 (file)
@@ -9,6 +9,7 @@
 #include <linux/limits.h>
 #include <linux/ioctl.h>
 #include <linux/blk_types.h>
+#include <linux/types.h>
 
 /*
  * It's silly to have NR_OPEN bigger than NR_FILE, but you can change