Skip to content

Commit

Permalink
Merge tag 'for-linus-20180713' of git://git.kernel.dk/linux-block
Browse files Browse the repository at this point in the history
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
  • Loading branch information
Linus Torvalds committed Jul 14, 2018
2 parents f353078 + 70dbcc2 commit 2da8c42
Showing 1 changed file with 0 additions and 2 deletions.
2 changes: 0 additions & 2 deletions block/bsg.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 2da8c42

Please sign in to comment.