From 12944d162e13c7f853c29730c45dce27b5256e8a Mon Sep 17 00:00:00 2001 Message-Id: <12944d162e13c7f853c29730c45dce27b5256e8a.1507237259.git.Jim.Somerville@windriver.com> In-Reply-To: <2a9fb6a58e40e8604d97223603111e869bb774b1.1507237258.git.Jim.Somerville@windriver.com> References: <2a9fb6a58e40e8604d97223603111e869bb774b1.1507237258.git.Jim.Somerville@windriver.com> From: Chris Friesen Date: Wed, 11 Jan 2017 13:38:37 -0500 Subject: [PATCH 13/24] Enable building kernel with CONFIG_BLK_DEV_NBD By default, the CentOS 7.3 kernel will fail to build if CONFIG_BLK_DEV_NBD is enabled, either as module or builtin. The issue seems to be due to the use of REQ_TYPE_SPECIAL in the NBD code. Switching it to use REQ_TYPE_DRV_PRIV instead makes the problem go away. Signed-off-by: Jim Somerville --- drivers/block/nbd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c index a40a4f0..e0c6b62 100644 --- a/drivers/block/nbd.c +++ b/drivers/block/nbd.c @@ -616,7 +616,7 @@ static int __nbd_ioctl(struct block_device *bdev, struct nbd_device *nbd, fsync_bdev(bdev); mutex_lock(&nbd->tx_lock); blk_rq_init(NULL, &sreq); - sreq.cmd_type = REQ_TYPE_SPECIAL; + sreq.cmd_type = REQ_TYPE_DRV_PRIV; nbd_cmd(&sreq) = NBD_CMD_DISC; /* Check again after getting mutex back. */ -- 1.8.3.1