From 74ee3ef569ac76b7a600ac69097f8ff96aaa5b50 Mon Sep 17 00:00:00 2001 From: Ingo Molnar Date: Thu, 28 Oct 2010 12:03:05 -0400 Subject: [PATCH 2/2] fs: build fix when !CONFIG_BLOCK MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Today's -tip fails to build on !CONFIG_BLOCK, due to upstream commit 367a51a ("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 Signed-off-by: "Theodore Ts'o" --- include/linux/fs.h | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/include/linux/fs.h b/include/linux/fs.h index 6ed7ace..1c73b50 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -9,6 +9,7 @@ #include #include #include +#include /* * It's silly to have NR_OPEN bigger than NR_FILE, but you can change -- 1.7.2.3