fs/compat_ioctl: fix build when !BLOCK
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 <a.beregalov@gmail.com> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Родитель
117aff744a
Коммит
1ba0c7dbbb
|
@ -58,7 +58,6 @@
|
||||||
#include <linux/i2c.h>
|
#include <linux/i2c.h>
|
||||||
#include <linux/i2c-dev.h>
|
#include <linux/i2c-dev.h>
|
||||||
#include <linux/atalk.h>
|
#include <linux/atalk.h>
|
||||||
#include <linux/loop.h>
|
|
||||||
|
|
||||||
#include <net/bluetooth/bluetooth.h>
|
#include <net/bluetooth/bluetooth.h>
|
||||||
#include <net/bluetooth/hci.h>
|
#include <net/bluetooth/hci.h>
|
||||||
|
@ -68,6 +67,7 @@
|
||||||
#include <linux/gigaset_dev.h>
|
#include <linux/gigaset_dev.h>
|
||||||
|
|
||||||
#ifdef CONFIG_BLOCK
|
#ifdef CONFIG_BLOCK
|
||||||
|
#include <linux/loop.h>
|
||||||
#include <scsi/scsi.h>
|
#include <scsi/scsi.h>
|
||||||
#include <scsi/scsi_ioctl.h>
|
#include <scsi/scsi_ioctl.h>
|
||||||
#include <scsi/sg.h>
|
#include <scsi/sg.h>
|
||||||
|
@ -2660,6 +2660,8 @@ HANDLE_IOCTL(SONET_GETFRAMING, do_atm_ioctl)
|
||||||
HANDLE_IOCTL(SONET_GETFRSENSE, do_atm_ioctl)
|
HANDLE_IOCTL(SONET_GETFRSENSE, do_atm_ioctl)
|
||||||
/* block stuff */
|
/* block stuff */
|
||||||
#ifdef CONFIG_BLOCK
|
#ifdef CONFIG_BLOCK
|
||||||
|
/* loop */
|
||||||
|
IGNORE_IOCTL(LOOP_CLR_FD)
|
||||||
/* Raw devices */
|
/* Raw devices */
|
||||||
HANDLE_IOCTL(RAW_SETBIND, raw_ioctl)
|
HANDLE_IOCTL(RAW_SETBIND, raw_ioctl)
|
||||||
HANDLE_IOCTL(RAW_GETBIND, 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_BOTH32)
|
||||||
IGNORE_IOCTL(VFAT_IOCTL_READDIR_SHORT32)
|
IGNORE_IOCTL(VFAT_IOCTL_READDIR_SHORT32)
|
||||||
|
|
||||||
/* loop */
|
|
||||||
IGNORE_IOCTL(LOOP_CLR_FD)
|
|
||||||
|
|
||||||
#ifdef CONFIG_SPARC
|
#ifdef CONFIG_SPARC
|
||||||
/* Sparc framebuffers, handled in sbusfb_compat_ioctl() */
|
/* Sparc framebuffers, handled in sbusfb_compat_ioctl() */
|
||||||
IGNORE_IOCTL(FBIOGTYPE)
|
IGNORE_IOCTL(FBIOGTYPE)
|
||||||
|
|
Загрузка…
Ссылка в новой задаче