Commit 3c3622dc authored by Randy Dunlap's avatar Randy Dunlap Committed by Linus Torvalds
Browse files

Fix compile issues in fs/compat_ioctl.c when CONFIG_BLOCK is disabled 



Fix fs/compat_ioctl.c to handle CONFIG_BLOCK=n, CONFIG_SCSI=n to avoid
build errors:

In file included from include/scsi/scsi.h:12,
                 from fs/compat_ioctl.c:71:
include/scsi/scsi_cmnd.h:27:25: warning: "BLK_MAX_CDB" is not defined
include/scsi/scsi_cmnd.h:28:3: error: #error MAX_COMMAND_SIZE can not be bigger than BLK_MAX_CDB
In file included from include/scsi/scsi.h:12,
                 from fs/compat_ioctl.c:71:
include/scsi/scsi_cmnd.h: In function 'scsi_bidi_cmnd':
include/scsi/scsi_cmnd.h:182: error: implicit declaration of function 'blk_bidi_rq'
include/scsi/scsi_cmnd.h:183: error: dereferencing pointer to incomplete type
include/scsi/scsi_cmnd.h: In function 'scsi_in':
include/scsi/scsi_cmnd.h:189: error: dereferencing pointer to incomplete type

Signed-off-by: default avatarRandy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent e3621ee6

fs/compat_ioctl.c

+6 −0
Original line number Original line Diff line number Diff line
@@ -69,9 +69,11 @@ 
#include <linux/capi.h>

#include <linux/capi.h>

#include <linux/gigaset_dev.h>

#include <linux/gigaset_dev.h>





#ifdef CONFIG_BLOCK

#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>

#endif





#include <asm/uaccess.h>

#include <asm/uaccess.h>

#include <linux/ethtool.h>

#include <linux/ethtool.h>
@@ -2024,6 +2026,7 @@ COMPATIBLE_IOCTL(GIO_UNISCRNMAP) 
COMPATIBLE_IOCTL(PIO_UNISCRNMAP)

COMPATIBLE_IOCTL(PIO_UNISCRNMAP)

COMPATIBLE_IOCTL(PIO_FONTRESET)

COMPATIBLE_IOCTL(PIO_FONTRESET)

COMPATIBLE_IOCTL(PIO_UNIMAPCLR)

COMPATIBLE_IOCTL(PIO_UNIMAPCLR)

#ifdef CONFIG_BLOCK

/* Big S */

/* Big S */

COMPATIBLE_IOCTL(SCSI_IOCTL_GET_IDLUN)

COMPATIBLE_IOCTL(SCSI_IOCTL_GET_IDLUN)

COMPATIBLE_IOCTL(SCSI_IOCTL_DOORLOCK)

COMPATIBLE_IOCTL(SCSI_IOCTL_DOORLOCK)
@@ -2033,6 +2036,7 @@ COMPATIBLE_IOCTL(SCSI_IOCTL_GET_BUS_NUMBER) 
COMPATIBLE_IOCTL(SCSI_IOCTL_SEND_COMMAND)

COMPATIBLE_IOCTL(SCSI_IOCTL_SEND_COMMAND)

COMPATIBLE_IOCTL(SCSI_IOCTL_PROBE_HOST)

COMPATIBLE_IOCTL(SCSI_IOCTL_PROBE_HOST)

COMPATIBLE_IOCTL(SCSI_IOCTL_GET_PCI)

COMPATIBLE_IOCTL(SCSI_IOCTL_GET_PCI)

#endif

/* Big T */

/* Big T */

COMPATIBLE_IOCTL(TUNSETNOCSUM)

COMPATIBLE_IOCTL(TUNSETNOCSUM)

COMPATIBLE_IOCTL(TUNSETDEBUG)

COMPATIBLE_IOCTL(TUNSETDEBUG)
@@ -2103,6 +2107,7 @@ COMPATIBLE_IOCTL(SIOCGIFVLAN) 
COMPATIBLE_IOCTL(SIOCSIFVLAN)

COMPATIBLE_IOCTL(SIOCSIFVLAN)

COMPATIBLE_IOCTL(SIOCBRADDBR)

COMPATIBLE_IOCTL(SIOCBRADDBR)

COMPATIBLE_IOCTL(SIOCBRDELBR)

COMPATIBLE_IOCTL(SIOCBRDELBR)

#ifdef CONFIG_BLOCK

/* SG stuff */

/* SG stuff */

COMPATIBLE_IOCTL(SG_SET_TIMEOUT)

COMPATIBLE_IOCTL(SG_SET_TIMEOUT)

COMPATIBLE_IOCTL(SG_GET_TIMEOUT)

COMPATIBLE_IOCTL(SG_GET_TIMEOUT)
@@ -2127,6 +2132,7 @@ COMPATIBLE_IOCTL(SG_SCSI_RESET) 
COMPATIBLE_IOCTL(SG_GET_REQUEST_TABLE)

COMPATIBLE_IOCTL(SG_GET_REQUEST_TABLE)

COMPATIBLE_IOCTL(SG_SET_KEEP_ORPHAN)

COMPATIBLE_IOCTL(SG_SET_KEEP_ORPHAN)

COMPATIBLE_IOCTL(SG_GET_KEEP_ORPHAN)

COMPATIBLE_IOCTL(SG_GET_KEEP_ORPHAN)

#endif

/* PPP stuff */

/* PPP stuff */

COMPATIBLE_IOCTL(PPPIOCGFLAGS)

COMPATIBLE_IOCTL(PPPIOCGFLAGS)

COMPATIBLE_IOCTL(PPPIOCSFLAGS)

COMPATIBLE_IOCTL(PPPIOCSFLAGS)

CRA Git | Maintained and supported by SUSTech CRA and CCSE