diff options
| author | Jens Axboe <axboe@kernel.dk> | 2018-08-05 19:32:09 -0600 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2018-08-05 19:32:09 -0600 |
| commit | 05b9ba4b550ff67d7362608828405f9e389e8988 (patch) | |
| tree | 12b0f4e41c1491fe5087480d9c47e61aff8a1d33 /block/bsg.c | |
| parent | 704f83928c8e7da6e06144569efb15dec73278e8 (diff) | |
| parent | d72e90f33aa4709ebecc5005562f52335e106a60 (diff) | |
| download | lwn-05b9ba4b550ff67d7362608828405f9e389e8988.tar.gz lwn-05b9ba4b550ff67d7362608828405f9e389e8988.zip | |
Merge tag 'v4.18-rc6' into for-4.19/block2
Pull in 4.18-rc6 to get the NVMe core AEN change to avoid a
merge conflict down the line.
Signed-of-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block/bsg.c')
| -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 0d2e9bf6208b..db588add6ba6 100644 --- a/block/bsg.c +++ b/block/bsg.c @@ -196,8 +196,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) |