diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2018-07-14 12:28:00 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-07-14 12:28:00 -0700 |
| commit | 2da8c426d90355eef1d42d974d2dccf0f5f7f21d (patch) | |
| tree | 7b04d0019e1d439026911e651b323ff5e5d3b18f /block | |
| parent | Merge branch 'akpm' (patches from Andrew) (diff) | |
| parent | bsg: fix bogus EINVAL on non-data commands (diff) | |
| download | linux-dev-2da8c426d90355eef1d42d974d2dccf0f5f7f21d.tar.xz linux-dev-2da8c426d90355eef1d42d974d2dccf0f5f7f21d.zip | |
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.c | 2 |
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) |