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
This commit is contained in:
@@ -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) {
|
} else if (hdr->din_xfer_len) {
|
||||||
ret = blk_rq_map_user(q, rq, NULL, uptr64(hdr->din_xferp),
|
ret = blk_rq_map_user(q, rq, NULL, uptr64(hdr->din_xferp),
|
||||||
hdr->din_xfer_len, GFP_KERNEL);
|
hdr->din_xfer_len, GFP_KERNEL);
|
||||||
} else {
|
|
||||||
ret = blk_rq_map_user(q, rq, NULL, NULL, 0, GFP_KERNEL);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (ret)
|
if (ret)
|
||||||
|
|||||||
Reference in New Issue
Block a user