Merge tag 'for-linus-20180713' of git://git.kernel.dk/linux-block

torvalds · torvalds · commit 2da8c426d903 · 2018-07-14T12:28:00.000-07:00
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
diff --git 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)

Original file line number	Diff line number	Diff line change
`@@ -267,8 +267,6 @@ bsg_map_hdr(struct request_queue q, struct sg_io_v4 hdr, fmode_t mode)`
`267`	`267`	`} else if (hdr->din_xfer_len) {`
`268`	`268`	`ret = blk_rq_map_user(q, rq, NULL, uptr64(hdr->din_xferp),`
`269`	`269`	`hdr->din_xfer_len, GFP_KERNEL);`
`270`		`- } else {`
`271`		`- ret = blk_rq_map_user(q, rq, NULL, NULL, 0, GFP_KERNEL);`
`272`	`270`	`}`
`273`	`271`
`274`	`272`	`if (ret)`