---

yaml --- r: 113164 b: refs/heads/master c: 06270d5 h: refs/heads/master v: v3
git-mirror · Oct 12, 2008 · fa6bb3f · fa6bb3f
1 parent 6ad19d9
commit fa6bb3f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git 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
@@ -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)
 {