Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 65f5be35 authored by Lars Ellenberg's avatar Lars Ellenberg Committed by Jens Axboe
Browse files

drbd: discard_zeroes_if_aligned allows "thin" resync for discard_zeroes_data=0 



Even if discard_zeroes_data != 0,
if discard_zeroes_if_aligned is set, we assume we can reliably
zero-out/discard using the drbd_issue_peer_discard() helper.

Signed-off-by: default avatarPhilipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: default avatarLars Ellenberg <lars.ellenberg@linbit.com>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent af61494a

drivers/block/drbd/drbd_nl.c

+6 −3
Original line number Diff line number Diff line
@@ -1408,10 +1408,13 @@ static void sanitize_disk_conf(struct drbd_device *device, struct disk_conf *dis 
	if (disk_conf->al_extents > drbd_al_extents_max(nbc))

		disk_conf->al_extents = drbd_al_extents_max(nbc);



	if (!blk_queue_discard(q) || !q->limits.discard_zeroes_data) {

	if (!blk_queue_discard(q)

	    || (!q->limits.discard_zeroes_data && !disk_conf->discard_zeroes_if_aligned)) {

		if (disk_conf->rs_discard_granularity) {

			disk_conf->rs_discard_granularity = 0; /* disable feature */

			drbd_info(device, "rs_discard_granularity feature disabled\n");

		}

	}



	if (disk_conf->rs_discard_granularity) {

		int orig_value = disk_conf->rs_discard_granularity;