summaryrefslogtreecommitdiff
path: root/block
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2018-07-14 22:28:00 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2018-07-14 22:28:00 +0300
commit2da8c426d90355eef1d42d974d2dccf0f5f7f21d (patch)
tree7b04d0019e1d439026911e651b323ff5e5d3b18f /block
parentf353078f028fbfe9acd4b747b4a19c69ef6846cd (diff)
parent70dbcc2254fa2a9add74a122b9dac954c4736e01 (diff)
downloadlinux-2da8c426d90355eef1d42d974d2dccf0f5f7f21d.tar.xz
Merge tag 'for-linus-20180713' of git://git.kernel.dk/linux-block
Pull block fix from Jens Axboe: "Just a single regression fix (from 4.17) for bsg, fixing an EINVAL return on non-data commands" * tag 'for-linus-20180713' of git://git.kernel.dk/linux-block: bsg: fix bogus EINVAL on non-data commands
Diffstat (limited to 'block')
-rw-r--r--block/bsg.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/block/bsg.c b/block/bsg.c
index 66602c489956..3da540faf673 100644
--- a/block/bsg.c
+++ b/block/bsg.c
@@ -267,8 +267,6 @@ bsg_map_hdr(struct request_queue *q, struct sg_io_v4 *hdr, fmode_t mode)
} else if (hdr->din_xfer_len) {
ret = blk_rq_map_user(q, rq, NULL, uptr64(hdr->din_xferp),
hdr->din_xfer_len, GFP_KERNEL);
- } else {
- ret = blk_rq_map_user(q, rq, NULL, NULL, 0, GFP_KERNEL);
}
if (ret)