All of lore.kernel.org
 help / color / mirror / Atom feed
From: Nathan Chancellor <nathan@kernel.org>
To: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>,
	"Martin K. Petersen" <martin.petersen@oracle.com>,
	Christoph Hellwig <hch@lst.de>
Cc: linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org,
	Nathan Chancellor <nathan@kernel.org>,
	kernel test robot <lkp@intel.com>
Subject: [PATCH] bsg: Fix build error with CONFIG_BLK_DEV_BSG_COMMON=m
Date: Thu, 29 Jul 2021 18:21:08 -0700	[thread overview]
Message-ID: <20210730012108.3385990-1-nathan@kernel.org> (raw)

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/")
Reported-by: kernel test robot <lkp@intel.com>
Signed-off-by: Nathan Chancellor <nathan@kernel.org>
---
 include/linux/bsg.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/linux/bsg.h b/include/linux/bsg.h
index b887da20bd41..9602ae3ab01b 100644
--- a/include/linux/bsg.h
+++ b/include/linux/bsg.h
@@ -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
-- 
2.32.0.264.g75ae10bc75


             reply	other threads:[~2021-07-30  1:22 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-07-30  1:21 Nathan Chancellor [this message]
2021-07-30  7:27 ` [PATCH] bsg: Fix build error with CONFIG_BLK_DEV_BSG_COMMON=m Christoph Hellwig

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210730012108.3385990-1-nathan@kernel.org \
    --to=nathan@kernel.org \
    --cc=fujita.tomonori@lab.ntt.co.jp \
    --cc=hch@lst.de \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-scsi@vger.kernel.org \
    --cc=lkp@intel.com \
    --cc=martin.petersen@oracle.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.