diff options
| author | Rafael Gieschke | 2018-03-23 23:59:15 +0100 |
|---|---|---|
| committer | Rafael Gieschke | 2018-03-23 23:59:15 +0100 |
| commit | 69e354e2ec419459a215fa323d2009593ca5e789 (patch) | |
| tree | 1b33c9d5e20ffa78da323cbe4ca7133c0fd0936d /src/kernel/blk.c | |
| parent | [SERVER] Delete image files after releasing image to get rid of stale .map files (diff) | |
| download | dnbd3-69e354e2ec419459a215fa323d2009593ca5e789.tar.gz dnbd3-69e354e2ec419459a215fa323d2009593ca5e789.tar.xz dnbd3-69e354e2ec419459a215fa323d2009593ca5e789.zip | |
Follow https://github.com/torvalds/linux/commit/aebf526b53aea164508730427597d45f3e06b376
Diffstat (limited to 'src/kernel/blk.c')
| -rw-r--r-- | src/kernel/blk.c | 8 |
1 files changed, 4 insertions, 4 deletions
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); } |