2008-10-12 04:16:22

by Adrian Bunk

Subject: [2.6 patch] provide generic_block_fiemap() only with BLOCK=y

This patch fixes the following compile error with CONFIG_BLOCK=n caused
by commit 68c9d702bb72f367f3b148963ec6cf5e07ff7f65
(generic block based fiemap implementation):

<-- snip -->

...
CC fs/ioctl.o
fs/ioctl.c: In function 'generic_block_fiemap':
fs/ioctl.c:249: error: storage size of 'tmp' isn't known
fs/ioctl.c:272: error: invalid application of 'sizeof' to incomplete type 'struct buffer_head'
fs/ioctl.c:280: error: implicit declaration of function 'buffer_mapped'
fs/ioctl.c:249: warning: unused variable 'tmp'
make[2]: *** [fs/ioctl.o] Error 1

<-- snip -->


Signed-off-by: Adrian Bunk <[email protected]>

---

fs/ioctl.c | 4 ++++
1 file changed, 4 insertions(+)


diff --git a/fs/ioctl.c b/fs/ioctl.c
index 33a6b7e..d152856 100644
--- a/fs/ioctl.c
+++ b/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)
{

2008-10-12 14:24:17

by Josef Bacik

Subject: Re: [2.6 patch] provide generic_block_fiemap() only with BLOCK=y

On Sun, Oct 12, 2008 at 07:15:19AM +0300, Adrian Bunk wrote:
> This patch fixes the following compile error with CONFIG_BLOCK=n caused
> by commit 68c9d702bb72f367f3b148963ec6cf5e07ff7f65
> (generic block based fiemap implementation):
>
> <-- snip -->
>
> ...
> CC fs/ioctl.o
> fs/ioctl.c: In function 'generic_block_fiemap':
> fs/ioctl.c:249: error: storage size of 'tmp' isn't known
> fs/ioctl.c:272: error: invalid application of 'sizeof' to incomplete type 'struct buffer_head'
> fs/ioctl.c:280: error: implicit declaration of function 'buffer_mapped'
> fs/ioctl.c:249: warning: unused variable 'tmp'
> make[2]: *** [fs/ioctl.o] Error 1
>
> <-- snip -->
>
>
> Signed-off-by: Adrian Bunk <[email protected]>
>

Acked-by: Josef Bacik <[email protected]>

Thanks,

Josef