diff options
| author | Mike Snitzer <snitzer@redhat.com> | 2016-05-05 15:21:14 -0400 |
|---|---|---|
| committer | Mike Snitzer <snitzer@redhat.com> | 2016-05-05 15:21:14 -0400 |
| commit | ef1d88ced108df7d652cf3f514b920e661826b71 (patch) | |
| tree | fe18b0d5c61b0371b9573c58973e459b10ebeb21 /drivers | |
| parent | 04974df8049fc4240d22759a91e035082ccd18b4 (diff) | |
| parent | 0ef5a50c1658d4d96a44f145bcb92ff3310c75b1 (diff) | |
| download | op-kernel-dev-ef1d88ced108df7d652cf3f514b920e661826b71.zip op-kernel-dev-ef1d88ced108df7d652cf3f514b920e661826b71.tar.gz | |
Merge remote-tracking branch 'jens/for-4.7/core' into dm-4.7
Needed in order to update the DM thinp code to use the new async
__blkdev_issue_discard() interface.
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/block/skd_main.c | 2 | ||||
| -rw-r--r-- | drivers/scsi/sd.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/block/skd_main.c b/drivers/block/skd_main.c index 586f916..9a9ec21 100644 --- a/drivers/block/skd_main.c +++ b/drivers/block/skd_main.c @@ -562,7 +562,7 @@ skd_prep_discard_cdb(struct skd_scsi_request *scsi_req, put_unaligned_be32(count, &buf[16]); req = skreq->req; - blk_add_request_payload(req, page, len); + blk_add_request_payload(req, page, 0, len); } static void skd_request_fn_not_online(struct request_queue *q); diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c index f52b74c..69b0a4a 100644 --- a/drivers/scsi/sd.c +++ b/drivers/scsi/sd.c @@ -779,7 +779,7 @@ static int sd_setup_discard_cmnd(struct scsi_cmnd *cmd) * discarded on disk. This allows us to report completion on the full * amount of blocks described by the request. */ - blk_add_request_payload(rq, page, len); + blk_add_request_payload(rq, page, 0, len); ret = scsi_init_io(cmd); rq->__data_len = nr_bytes; |
