Commit b31d42a5 authored Oct 28, 2010 by Ingo Molnar Committed by Linus Torvalds Oct 28, 2010

Fix compile brekage with !CONFIG_BLOCK

Today's git tree fails to build on !CONFIG_BLOCK, due to upstream commit
367a51a3 ("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>

parent 1df1a4cb

include/linux/fs.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -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

Admin message