From 69e354e2ec419459a215fa323d2009593ca5e789 Mon Sep 17 00:00:00 2001
From: Rafael Gieschke
Date: Fri, 23 Mar 2018 23:59:15 +0100
Subject: Follow
 https://github.com/torvalds/linux/commit/aebf526b53aea164508730427597d45f3e06b376

---
 src/kernel/blk.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/kernel/blk.c')

diff --git a/src/kernel/blk.c b/src/kernel/blk.c
index 5dec195..6f2523c 100644
--- a/src/kernel/blk.c
+++ b/src/kernel/blk.c
@@ -267,7 +267,7 @@ void dnbd3_blk_request(struct request_queue *q)
 			continue;
 		}
 
-		if (req->cmd_type != REQ_TYPE_FS)
+		if (req_op(req) != REQ_OP_READ && req_op(req) != REQ_OP_WRITE)
 		{
 			__blk_end_request_all(req, 0);
 			continue;
@@ -279,7 +279,7 @@ void dnbd3_blk_request(struct request_queue *q)
 			continue;
 		}
 
-		if (rq_data_dir(req) != READ)
+		if (req_op(req) != REQ_OP_READ)
 		{
 			__blk_end_request_all(req, -EACCES);
 			continue;
@@ -341,13 +341,13 @@ void dnbd3_blk_fail_all_requests(dnbd3_device_t *dev)
 	list_for_each_entry_safe(blk_request, tmp_request, &local_copy, queuelist)
 	{
 		list_del_init(&blk_request->queuelist);
-		if (blk_request->cmd_type == REQ_TYPE_FS)
+		if (req_op(blk_request) == REQ_OP_READ || req_op(blk_request) == REQ_OP_WRITE)
 		{
 			spin_lock_irqsave(&dev->blk_lock, flags);
 			__blk_end_request_all(blk_request, -EIO);
 			spin_unlock_irqrestore(&dev->blk_lock, flags);
 		}
-		else if (blk_request->cmd_type == REQ_TYPE_SPECIAL)
+		else if (blk_rq_is_private(blk_request))
 		{
 			kfree(blk_request);
 		}
-- 
cgit v1.2.3-55-g7522