aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2016-07-12 11:36:40 -0400
committerJens Axboe <axboe@fb.com>2016-07-12 11:36:40 -0400
commit6eae8c45206733ba3a56b4f9e278774ad397b092 (patch)
tree5d60f2047786da87bacb41f8858c04a58c8cde1a
parent69555af2ce32a31d11666e5fe20628b35fdf7ef3 (diff)
nvme-loop: fix nvme-loop Kconfig dependencies
I ran into the same problem on NVME_TARGET_RDMA now, which otherwise needs dependencies on both CONFIG_BLOCK and CONFIGFS_FS: warning: (NVME_TARGET_LOOP && NVME_TARGET_RDMA) selects NVME_TARGET which has unmet direct dependencies (BLOCK && CONFIGFS_FS) 0xA002B368 Mon Jul 11 18:00:45 CEST 2016 failed In file included from ../drivers/nvme/target/core.c:16:0: drivers/nvme/target/nvmet.h:222:14: error: field 'inline_bio' has incomplete type struct bio inline_bio; ^~~~~~~~~~ drivers/nvme/target/core.c: In function 'nvmet_async_event_work': drivers/nvme/target/core.c:98:3: error: implicit declaration of function 'kfree' [-Werror=implicit-function-declaration] kfree(aen); ^~~~~ ../drivers/nvme/target/core.c: In function 'nvmet_ns_enable': ../drivers/nvme/target/core.c:269:13: error: implicit declaration of function 'blkdev_get_by_path' [-Werror=implicit-function-declaration] ns->bdev = blkdev_get_by_path(ns->device_path, FMODE_READ | FMODE_WRITE, Folding in my patch below should address that too. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Reported-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Jens Axboe <axboe@fb.com>
-rw-r--r--drivers/nvme/target/Kconfig5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/nvme/target/Kconfig b/drivers/nvme/target/Kconfig
index 0be9e3d4c352..a5c31cbeb481 100644
--- a/drivers/nvme/target/Kconfig
+++ b/drivers/nvme/target/Kconfig
@@ -16,8 +16,7 @@ config NVME_TARGET
16config NVME_TARGET_LOOP 16config NVME_TARGET_LOOP
17 tristate "NVMe loopback device support" 17 tristate "NVMe loopback device support"
18 depends on BLK_DEV_NVME 18 depends on BLK_DEV_NVME
19 depends on CONFIGFS_FS 19 depends on NVME_TARGET
20 select NVME_TARGET
21 select NVME_FABRICS 20 select NVME_FABRICS
22 select SG_POOL 21 select SG_POOL
23 help 22 help
@@ -29,7 +28,7 @@ config NVME_TARGET_LOOP
29config NVME_TARGET_RDMA 28config NVME_TARGET_RDMA
30 tristate "NVMe over Fabrics RDMA target support" 29 tristate "NVMe over Fabrics RDMA target support"
31 depends on INFINIBAND 30 depends on INFINIBAND
32 select NVME_TARGET 31 depends on NVME_TARGET
33 help 32 help
34 This enables the NVMe RDMA target support, which allows exporting NVMe 33 This enables the NVMe RDMA target support, which allows exporting NVMe
35 devices over RDMA. 34 devices over RDMA.