From: Josh Durgin <josh.durgin@inktank.com>
Date: Mon, 7 Apr 2014 23:52:03 +0000 (-0700)
Subject: rbd: set the remaining discard properties to enable support
X-Git-Tag: v4.9.8~5518^2~18
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b76f82398c1017e303d87760e22125714010207f;p=platform%2Fkernel%2Flinux-rpi3.git

rbd: set the remaining discard properties to enable support

max_discard_sectors must be set for the queue to support discard.
Operations implementing discard for rbd zero data, so report that.

Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
---

diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
index e1dcd36..7712ae6 100644
--- a/drivers/block/rbd.c
+++ b/drivers/block/rbd.c
@@ -3764,6 +3764,8 @@ static int rbd_init_disk(struct rbd_device *rbd_dev)
 	queue_flag_set_unlocked(QUEUE_FLAG_DISCARD, q);
 	q->limits.discard_granularity = segment_size;
 	q->limits.discard_alignment = segment_size;
+	q->limits.max_discard_sectors = segment_size / SECTOR_SIZE;
+	q->limits.discard_zeroes_data = 1;
 
 	blk_queue_merge_bvec(q, rbd_merge_bvec);
 	disk->queue = q;