Skip to contentSkip to conversation

bsg: Fix build error with CONFIG_BLK_DEV_BSG_COMMON=m

PATCH In review Nathan Chancellor 2 participants 2 messages Jul 30, 2021

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 bsg: Fix build error with CONFIG_BLK_DEV_BSG_COMMON=m

When CONFIG_BLK_DEV_BSG_COMMON is enabled as a module, which can happen when CONFIG_SCSI=m and CONFIG_BLK_DEV_BSGLIB=n, the following error occurs:

In file included from arch/x86/kernel/asm-offsets.c:13:
In file included from include/linux/suspend.h:5:
In file included from include/linux/swap.h:9:
In file included from include/linux/memcontrol.h:22:
In file included from include/linux/writeback.h:14:
In file included from include/linux/blk-cgroup.h:23:
include/linux/blkdev.h:539:26: error: field has incomplete type 'struct bsg_class_device'

        struct bsg_class_device bsg_dev;
                                ^
include/linux/blkdev.h:539:9: note: forward declaration of 'struct
bsg_class_device'
        struct bsg_class_device bsg_dev;
               ^

1 error generated.

The definition of struct bsg_class_device is kept under an #ifdef directive, which does not work when CONFIG_BLK_DEV_BSG_COMMON is a module, as the define is CONFIG_BLK_DEV_BSG_COMMON_MODULE.

Use IS_ENABLED instead, which evaluates to 1 when
CONFIG_BLK_DEV_BSG_COMMON is y or m.

Fixes 78011042684d ("scsi: bsg: Move bsg_scsi_ops to drivers/scsi/")
---
 include/linux/bsg.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
include/linux/bsg.h +1 -1
index b887da20bd41..9602ae3ab01b 100644
@@ -7,7 +7,7 @@
 struct request;
 struct request_queue;
 
-#ifdef CONFIG_BLK_DEV_BSG_COMMON
+#if IS_ENABLED(CONFIG_BLK_DEV_BSG_COMMON)
 struct bsg_ops {
 	int	(*check_proto)(struct sg_io_v4 *hdr);
 	int	(*fill_hdr)(struct request *rq, struct sg_io_v4 *hdr,

base-commit: 08dc2f9b53afbbc897bc895aa41906194f5af1cf

Signature · 1 line
2.32.0.264.g75ae10bc75
#1 lore raw
Quoted 24 lines · Nathan Chancellor

When CONFIG_BLK_DEV_BSG_COMMON is enabled as a module, which can happen when CONFIG_SCSI=m and CONFIG_BLK_DEV_BSGLIB=n, the following error occurs:

In file included from arch/x86/kernel/asm-offsets.c:13:
In file included from include/linux/suspend.h:5:
In file included from include/linux/swap.h:9:
In file included from include/linux/memcontrol.h:22:
In file included from include/linux/writeback.h:14:
In file included from include/linux/blk-cgroup.h:23:
include/linux/blkdev.h:539:26: error: field has incomplete type 'struct bsg_class_device'

        struct bsg_class_device bsg_dev;
                                ^
include/linux/blkdev.h:539:9: note: forward declaration of 'struct
bsg_class_device'
        struct bsg_class_device bsg_dev;
               ^

1 error generated.

The definition of struct bsg_class_device is kept under an #ifdef directive, which does not work when CONFIG_BLK_DEV_BSG_COMMON is a module, as the define is CONFIG_BLK_DEV_BSG_COMMON_MODULE.

Quoted 6 lines

Use IS_ENABLED instead, which evaluates to 1 when
CONFIG_BLK_DEV_BSG_COMMON is y or m.

Fixes 78011042684d ("scsi: bsg: Move bsg_scsi_ops to drivers/scsi/")

Looks fine. Although I have a larger series pending here:

https://lore.kernel.org/linux-scsi/[email protected]/T/#t

that should also fix this issue as a byproduct.