From fa6bb3f6a0a26c75f90e92fc53dba258a789bc1f Mon Sep 17 00:00:00 2001
From: Adrian Bunk <bunk@kernel.org>
Date: Sun, 12 Oct 2008 07:15:19 +0300
Subject: [PATCH] --- yaml --- r: 113164 b: refs/heads/master c:
 06270d5d6aefb46b88bf44a7c5b1b9b3ef352c48 h: refs/heads/master v: v3

---
 [refs]           | 2 +-
 trunk/fs/ioctl.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index e7655dd91600..98b56eec33be 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0dab9cfa17179d1f5b067a32a3bca06cd31a3149
+refs/heads/master: 06270d5d6aefb46b88bf44a7c5b1b9b3ef352c48
diff --git a/trunk/fs/ioctl.c b/trunk/fs/ioctl.c
index 33a6b7ecb8b8..d152856c371b 100644
--- a/trunk/fs/ioctl.c
+++ b/trunk/fs/ioctl.c
@@ -226,6 +226,8 @@ static int ioctl_fiemap(struct file *filp, unsigned long arg)
 	return error;
 }
 
+#ifdef CONFIG_BLOCK
+
 #define blk_to_logical(inode, blk) (blk << (inode)->i_blkbits)
 #define logical_to_blk(inode, offset) (offset >> (inode)->i_blkbits);
 
@@ -342,6 +344,8 @@ int generic_block_fiemap(struct inode *inode,
 }
 EXPORT_SYMBOL(generic_block_fiemap);
 
+#endif  /*  CONFIG_BLOCK  */
+
 static int file_ioctl(struct file *filp, unsigned int cmd,
 		unsigned long arg)
 {