[PATCH] compat_ioctl requires CONFIG_BLOCK

[PATCH] compat_ioctl requires CONFIG_BLOCK

[Sebastian Siewior]

[-- Attachment #1: compat_ioctl_fix.diff --]
[-- Type: text/plain, Size: 899 bytes --]

Got with randconfig
include/linux/loop.h:66: error: expected specifier-qualifier-list before
'request_queue_t'
make[1]: *** [fs/compat_ioctl.o] Error 1

parts of compat ioctl require CONFIG_BLOCK to be set.

Signed-off-by: Sebastian Siewior <sebastian@breakpoint.cc>
Index: b/fs/compat_ioctl.c
===================================================================
--- a/fs/compat_ioctl.c
+++ b/fs/compat_ioctl.c
@@ -63,7 +63,9 @@
 #include <linux/wireless.h>
 #include <linux/atalk.h>
 #include <linux/blktrace_api.h>
+#ifdef CONFIG_BLOCK
 #include <linux/loop.h>
+#endif
 
 #include <net/bluetooth/bluetooth.h>
 #include <net/bluetooth/hci.h>
@@ -3491,8 +3493,10 @@ HANDLE_IOCTL(LPSETTIMEOUT, lp_timeout_tr
 IGNORE_IOCTL(VFAT_IOCTL_READDIR_BOTH32)
 IGNORE_IOCTL(VFAT_IOCTL_READDIR_SHORT32)
 
+#ifdef CONFIG_BLOCK
 /* loop */
 IGNORE_IOCTL(LOOP_CLR_FD)
+#endif
 };
 
 #define IOCTL_HASHSIZE 256

-- 

Re: [PATCH] compat_ioctl requires CONFIG_BLOCK

[Arnd Bergmann]

On Saturday 21 July 2007, Sebastian Siewior wrote:
> 
> Got with randconfig
> include/linux/loop.h:66: error: expected specifier-qualifier-list before
> 'request_queue_t'
> make[1]: *** [fs/compat_ioctl.o] Error 1
> 
> parts of compat ioctl require CONFIG_BLOCK to be set.
> 
> Signed-off-by: Sebastian Siewior <sebastian@breakpoint.cc>
> Index: b/fs/compat_ioctl.c
> ===================================================================
> --- a/fs/compat_ioctl.c
> +++ b/fs/compat_ioctl.c
> @@ -63,7 +63,9 @@
>  #include <linux/wireless.h>
>  #include <linux/atalk.h>
>  #include <linux/blktrace_api.h>
> +#ifdef CONFIG_BLOCK
>  #include <linux/loop.h>
> +#endif

Adding #ifdef around an #include is considered bad style. Better just
make loop.h compile without any conditionals. Does the below
patch work for you?

	Arnd <><

--- a/include/linux/loop.h
+++ b/include/linux/loop.h
@@ -63,7 +63,7 @@ struct loop_device {
 	struct task_struct	*lo_thread;
 	wait_queue_head_t	lo_event;
 
-	request_queue_t		*lo_queue;
+	struct request_queue	*lo_queue;
 	struct gendisk		*lo_disk;
 	struct list_head	lo_list;
 };

Re: [PATCH] compat_ioctl requires CONFIG_BLOCK

[Sebastian Siewior]

* Arnd Bergmann | 2007-07-21 01:08:57 [+0200]:

>On Saturday 21 July 2007, Sebastian Siewior wrote:
>> 
>> Got with randconfig
>> include/linux/loop.h:66: error: expected specifier-qualifier-list before
>> 'request_queue_t'
>> make[1]: *** [fs/compat_ioctl.o] Error 1
>> 
>> parts of compat ioctl require CONFIG_BLOCK to be set.
>> 
>> Signed-off-by: Sebastian Siewior <sebastian@breakpoint.cc>
>> Index: b/fs/compat_ioctl.c
>> ===================================================================
>> --- a/fs/compat_ioctl.c
>> +++ b/fs/compat_ioctl.c
>> @@ -63,7 +63,9 @@
>>  #include <linux/wireless.h>
>>  #include <linux/atalk.h>
>>  #include <linux/blktrace_api.h>
>> +#ifdef CONFIG_BLOCK
>>  #include <linux/loop.h>
>> +#endif
>
>Adding #ifdef around an #include is considered bad style. Better just
>make loop.h compile without any conditionals. Does the below
>patch work for you?
>
Yes it does.

>	Arnd <><

Sebastian

>
>--- a/include/linux/loop.h
>+++ b/include/linux/loop.h
>@@ -63,7 +63,7 @@ struct loop_device {
> 	struct task_struct	*lo_thread;
> 	wait_queue_head_t	lo_event;
> 
>-	request_queue_t		*lo_queue;
>+	struct request_queue	*lo_queue;
> 	struct gendisk		*lo_disk;
> 	struct list_head	lo_list;
> };

Re: [PATCH] compat_ioctl requires CONFIG_BLOCK

[Christoph Hellwig]

On Sat, Jul 21, 2007 at 01:08:57AM +0200, Arnd Bergmann wrote:
> On Saturday 21 July 2007, Sebastian Siewior wrote:
> > 
> > Got with randconfig
> > include/linux/loop.h:66: error: expected specifier-qualifier-list before
> > 'request_queue_t'
> > make[1]: *** [fs/compat_ioctl.o] Error 1
> > 
> > parts of compat ioctl require CONFIG_BLOCK to be set.
> > 
> > Signed-off-by: Sebastian Siewior <sebastian@breakpoint.cc>
> > Index: b/fs/compat_ioctl.c
> > ===================================================================
> > --- a/fs/compat_ioctl.c
> > +++ b/fs/compat_ioctl.c
> > @@ -63,7 +63,9 @@
> > ?#include <linux/wireless.h>
> > ?#include <linux/atalk.h>
> > ?#include <linux/blktrace_api.h>
> > +#ifdef CONFIG_BLOCK
> > ?#include <linux/loop.h>
> > +#endif
> 
> Adding #ifdef around an #include is considered bad style. Better just
> make loop.h compile without any conditionals. Does the below
> patch work for you?

That patch looks good, but even better would be adding a compat_ioctl
handler to the loop driver.  IIRC you even have an old patch for that :)

Re: [PATCH] compat_ioctl requires CONFIG_BLOCK

[Arnd Bergmann]

On Saturday 21 July 2007, Christoph Hellwig wrote:
> 
> > Adding #ifdef around an #include is considered bad style. Better just
> > make loop.h compile without any conditionals. Does the below
> > patch work for you?
> 
> That patch looks good, but even better would be adding a compat_ioctl
> handler to the loop driver.  IIRC you even have an old patch for that 

No, that doesn't fly in this case. The loop driver actually has a
compat_ioctl method, but the problem is that some tools try to
call this ioctl on devices other than loop.

We could of course add a fallback handler to compat_blkdev_ioctl(),
but I'm not convinced that this is better than the IGNORE_IOCTL
helper, unless we eventually move all of fs/compat_ioctl.c into
drivers.

	Arnd <><

Re: [PATCH] compat_ioctl requires CONFIG_BLOCK

[Andrew Morton]

On Sat, 21 Jul 2007 01:08:57 +0200
Arnd Bergmann <arnd@arndb.de> wrote:

> On Saturday 21 July 2007, Sebastian Siewior wrote:
> > 
> > Got with randconfig
> > include/linux/loop.h:66: error: expected specifier-qualifier-list before
> > 'request_queue_t'
> > make[1]: *** [fs/compat_ioctl.o] Error 1
> > 
> > parts of compat ioctl require CONFIG_BLOCK to be set.
> > 
> > Signed-off-by: Sebastian Siewior <sebastian@breakpoint.cc>
> > Index: b/fs/compat_ioctl.c
> > ===================================================================
> > --- a/fs/compat_ioctl.c
> > +++ b/fs/compat_ioctl.c
> > @@ -63,7 +63,9 @@
> > __#include <linux/wireless.h>
> > __#include <linux/atalk.h>
> > __#include <linux/blktrace_api.h>
> > +#ifdef CONFIG_BLOCK
> > __#include <linux/loop.h>
> > +#endif
> 
> Adding #ifdef around an #include is considered bad style. Better just
> make loop.h compile without any conditionals. Does the below
> patch work for you?

This is the classic why-typedefs-are-bad.  AFAIK there is no way of fixing
this build error apart from adding otherwise-unneeded nested inclusions
(very bad), or:

> 	Arnd <><
> 
> --- a/include/linux/loop.h
> +++ b/include/linux/loop.h
> @@ -63,7 +63,7 @@ struct loop_device {
>  	struct task_struct	*lo_thread;
>  	wait_queue_head_t	lo_event;
>  
> -	request_queue_t		*lo_queue;
> +	struct request_queue	*lo_queue;
>  	struct gendisk		*lo_disk;
>  	struct list_head	lo_list;
>  };

Good start.  Now can we do the rest of the kernel?  ;)

Re: [PATCH] compat_ioctl requires CONFIG_BLOCK

[Jens Axboe]

On Mon, Jul 23 2007, Andrew Morton wrote:
> On Sat, 21 Jul 2007 01:08:57 +0200
> Arnd Bergmann <arnd@arndb.de> wrote:
> 
> > On Saturday 21 July 2007, Sebastian Siewior wrote:
> > > 
> > > Got with randconfig
> > > include/linux/loop.h:66: error: expected specifier-qualifier-list before
> > > 'request_queue_t'
> > > make[1]: *** [fs/compat_ioctl.o] Error 1
> > > 
> > > parts of compat ioctl require CONFIG_BLOCK to be set.
> > > 
> > > Signed-off-by: Sebastian Siewior <sebastian@breakpoint.cc>
> > > Index: b/fs/compat_ioctl.c
> > > ===================================================================
> > > --- a/fs/compat_ioctl.c
> > > +++ b/fs/compat_ioctl.c
> > > @@ -63,7 +63,9 @@
> > > __#include <linux/wireless.h>
> > > __#include <linux/atalk.h>
> > > __#include <linux/blktrace_api.h>
> > > +#ifdef CONFIG_BLOCK
> > > __#include <linux/loop.h>
> > > +#endif
> > 
> > Adding #ifdef around an #include is considered bad style. Better just
> > make loop.h compile without any conditionals. Does the below
> > patch work for you?
> 
> This is the classic why-typedefs-are-bad.  AFAIK there is no way of fixing
> this build error apart from adding otherwise-unneeded nested inclusions
> (very bad), or:
> 
> > 	Arnd <><
> > 
> > --- a/include/linux/loop.h
> > +++ b/include/linux/loop.h
> > @@ -63,7 +63,7 @@ struct loop_device {
> >  	struct task_struct	*lo_thread;
> >  	wait_queue_head_t	lo_event;
> >  
> > -	request_queue_t		*lo_queue;
> > +	struct request_queue	*lo_queue;
> >  	struct gendisk		*lo_disk;
> >  	struct list_head	lo_list;
> >  };
> 
> Good start.  Now can we do the rest of the kernel?  ;)

Yep indeed, it's been my plan to kill that ugly typedef for some time...

-- 
Jens Axboe