2009-04-21 07:33:01

by Jens Axboe

Subject: Re: [PATCH 1/2] fs/compat_ioctl: fix build when !BLOCK

On Mon, Apr 20 2009, Alexander Beregalov wrote:
> From: alexb <alexb@localhost.(none)>
>
> In file included from fs/compat_ioctl.c:61:
> include/linux/loop.h:59: error: field 'lo_bio_list' has incomplete type
>
> Signed-off-by: Alexander Beregalov <[email protected]>

Thanks, applied.

> ---
> fs/compat_ioctl.c | 7 +++----
> 1 files changed, 3 insertions(+), 4 deletions(-)
>
> diff --git a/fs/compat_ioctl.c b/fs/compat_ioctl.c
> index 3e87ce4..b83f6bc 100644
> --- a/fs/compat_ioctl.c
> +++ b/fs/compat_ioctl.c
> @@ -58,7 +58,6 @@
> #include <linux/i2c.h>
> #include <linux/i2c-dev.h>
> #include <linux/atalk.h>
> -#include <linux/loop.h>
>
> #include <net/bluetooth/bluetooth.h>
> #include <net/bluetooth/hci.h>
> @@ -68,6 +67,7 @@
> #include <linux/gigaset_dev.h>
>
> #ifdef CONFIG_BLOCK
> +#include <linux/loop.h>
> #include <scsi/scsi.h>
> #include <scsi/scsi_ioctl.h>
> #include <scsi/sg.h>
> @@ -2660,6 +2660,8 @@ HANDLE_IOCTL(SONET_GETFRAMING, do_atm_ioctl)
> HANDLE_IOCTL(SONET_GETFRSENSE, do_atm_ioctl)
> /* block stuff */
> #ifdef CONFIG_BLOCK
> +/* loop */
> +IGNORE_IOCTL(LOOP_CLR_FD)
> /* Raw devices */
> HANDLE_IOCTL(RAW_SETBIND, raw_ioctl)
> HANDLE_IOCTL(RAW_GETBIND, raw_ioctl)
> @@ -2728,9 +2730,6 @@ HANDLE_IOCTL(LPSETTIMEOUT, lp_timeout_trans)
> IGNORE_IOCTL(VFAT_IOCTL_READDIR_BOTH32)
> IGNORE_IOCTL(VFAT_IOCTL_READDIR_SHORT32)
>
> -/* loop */
> -IGNORE_IOCTL(LOOP_CLR_FD)
> -
> #ifdef CONFIG_SPARC
> /* Sparc framebuffers, handled in sbusfb_compat_ioctl() */
> IGNORE_IOCTL(FBIOGTYPE)
> --
> 1.6.2.3
>

--
Jens Axboe

2009-04-21 08:34:49

by Alexander Beregalov

Subject: Re: [PATCH 1/2] fs/compat_ioctl: fix build when !BLOCK

2009/4/21 Jens Axboe <[email protected]>:
> On Mon, Apr 20 2009, Alexander Beregalov wrote:
>> From: alexb <alexb@localhost.(none)>
>>
>> In file included from fs/compat_ioctl.c:61:
>> include/linux/loop.h:59: error: field 'lo_bio_list' has incomplete type
>>
>> Signed-off-by: Alexander Beregalov <[email protected]>
>
> Thanks, applied.

Hi Jens

Al has already sent it to Linus.

2009-04-21 09:21:44

by Jens Axboe

Subject: Re: [PATCH 1/2] fs/compat_ioctl: fix build when !BLOCK

On Tue, Apr 21 2009, Alexander Beregalov wrote:
> 2009/4/21 Jens Axboe <[email protected]>:
> > On Mon, Apr 20 2009, Alexander Beregalov wrote:
> >> From: alexb <alexb@localhost.(none)>
> >>
> >> In file included from fs/compat_ioctl.c:61:
> >> include/linux/loop.h:59: error: field 'lo_bio_list' has incomplete type
> >>
> >> Signed-off-by: Alexander Beregalov <[email protected]>
> >
> > Thanks, applied.
>
> Hi Jens
>
> Al has already sent it to Linus.

Oh, it's not in current -git. But it's not a problem, I notice those
kind of things when preparing the push.

--
Jens Axboe