42a05dcd81
This commit updates the standard kernel to 3.10.0-838 and the rt kernel to 3.10.0-802. Driver updates to ensure compilation also added (Mellanox driver, specifically) Depends-On: https://review.openstack.org/580689 Change-Id: Ie52d7df2f097ea03158b3b3a3334b61833cbdf57 Story: 2002761 Signed-off-by: Jason McKenna <jason.mckenna@windriver.com> Story: 2002761 Task: 22841
37 lines
1.4 KiB
Diff
37 lines
1.4 KiB
Diff
From 615791de3136070eb8fc9100aa8b5ead6905e56a Mon Sep 17 00:00:00 2001
|
|
Message-Id: <615791de3136070eb8fc9100aa8b5ead6905e56a.1528226387.git.Jim.Somerville@windriver.com>
|
|
In-Reply-To: <c8270e79f6b7008fde44b8d5aa6314d8cf89d3ed.1528226387.git.Jim.Somerville@windriver.com>
|
|
References: <c8270e79f6b7008fde44b8d5aa6314d8cf89d3ed.1528226387.git.Jim.Somerville@windriver.com>
|
|
From: Chris Friesen <chris.friesen@windriver.com>
|
|
Date: Wed, 11 Jan 2017 13:38:37 -0500
|
|
Subject: [PATCH 16/32] 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 <Jim.Somerville@windriver.com>
|
|
---
|
|
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
|
|
|