diff options
| author | Christoph Hellwig <hch@lst.de> | 2017-04-05 19:21:21 +0200 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2017-04-08 11:25:38 -0600 |
| commit | 0dbed96a3cc9786bc4814dab98a7218753bde934 (patch) | |
| tree | 8f6f673be536243457eb8ba5ce4cc271be7a3b2c /drivers/block/drbd/drbd_req.c | |
| parent | 71027e97d796d1e9b210a2f64bf2cc25e225a4c0 (diff) | |
| download | op-kernel-dev-0dbed96a3cc9786bc4814dab98a7218753bde934.zip op-kernel-dev-0dbed96a3cc9786bc4814dab98a7218753bde934.tar.gz | |
drbd: make intelligent use of blkdev_issue_zeroout
drbd always wants its discard wire operations to zero the blocks, so
use blkdev_issue_zeroout with the BLKDEV_ZERO_UNMAP flag instead of
reinventing it poorly.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Hannes Reinecke <hare@suse.com>
Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'drivers/block/drbd/drbd_req.c')
| -rw-r--r-- | drivers/block/drbd/drbd_req.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/block/drbd/drbd_req.c b/drivers/block/drbd/drbd_req.c index 652114a..6da9ea8 100644 --- a/drivers/block/drbd/drbd_req.c +++ b/drivers/block/drbd/drbd_req.c @@ -1148,10 +1148,10 @@ static int drbd_process_write_request(struct drbd_request *req) static void drbd_process_discard_req(struct drbd_request *req) { - int err = drbd_issue_discard_or_zero_out(req->device, - req->i.sector, req->i.size >> 9, true); + struct block_device *bdev = req->device->ldev->backing_bdev; - if (err) + if (blkdev_issue_zeroout(bdev, req->i.sector, req->i.size >> 9, + GFP_NOIO, 0)) req->private_bio->bi_error = -EIO; bio_endio(req->private_bio); } |
