]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commit
nvme-rdma: add back dependency on CONFIG_BLOCK
authorArnd Bergmann <arnd@arndb.de>
Tue, 6 Sep 2016 12:58:06 +0000 (14:58 +0200)
committerSagi Grimberg <sagi@grimberg.me>
Mon, 12 Sep 2016 19:29:43 +0000 (22:29 +0300)
commit2cfe199ca5a8816ee80fe15bcf202dd1020aaea0
tree763fa5b80080e64e2f4c2220db986cefaddcb6ba
parent1bda18de8f15a611a61d1a935b679db2e153338a
nvme-rdma: add back dependency on CONFIG_BLOCK

A recent change removed the dependency on BLK_DEV_NVME, which implies
the dependency on PCI and BLOCK. We don't need CONFIG_PCI, but without
CONFIG_BLOCK we get tons of build errors, e.g.

In file included from drivers/nvme/host/core.c:16:0:
linux/blk-mq.h:182:33: error: 'struct gendisk' declared inside parameter list will not be visible outside of this definition or declaration [-Werror]
drivers/nvme/host/core.c: In function 'nvme_setup_rw':
drivers/nvme/host/core.c:295:21: error: implicit declaration of function 'rq_data_dir' [-Werror=implicit-function-declaration]
drivers/nvme/host/nvme.h: In function 'nvme_map_len':
drivers/nvme/host/nvme.h:217:6: error: implicit declaration of function 'req_op' [-Werror=implicit-function-declaration]
drivers/nvme/host/scsi.c: In function 'nvme_trans_bdev_limits_page':
drivers/nvme/host/scsi.c:768:85: error: implicit declaration of function 'queue_max_hw_sectors' [-Werror=implicit-function-declaration]

This adds back the specific CONFIG_BLOCK dependency to avoid broken
configurations.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Fixes: aa71987472a9 ("nvme: fabrics drivers don't need the nvme-pci driver")
Signed-off-by: Sagi Grimberg <sagi@grimberg.me>
drivers/nvme/host/Kconfig