]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
mmc: remove the discard_zeroes_data flag
authorChristoph Hellwig <hch@lst.de>
Wed, 5 Apr 2017 17:21:19 +0000 (19:21 +0200)
committerJens Axboe <axboe@fb.com>
Sat, 8 Apr 2017 17:25:38 +0000 (11:25 -0600)
mmc only supports discarding on large alignments, so the zeroing code
would always fall back to explicit writings of zeroes.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Hannes Reinecke <hare@suse.com>
Signed-off-by: Jens Axboe <axboe@fb.com>
drivers/mmc/core/queue.c

index 493eb10ce58045851fc1064426acc08b842f4811..4c54ad34e17a186db798b23317e0c5e485495a4f 100644 (file)
@@ -167,8 +167,6 @@ static void mmc_queue_setup_discard(struct request_queue *q,
 
        queue_flag_set_unlocked(QUEUE_FLAG_DISCARD, q);
        blk_queue_max_discard_sectors(q, max_discard);
-       if (card->erased_byte == 0 && !mmc_can_discard(card))
-               q->limits.discard_zeroes_data = 1;
        q->limits.discard_granularity = card->pref_erase << 9;
        /* granularity must not be greater than max. discard */
        if (card->pref_erase > max_discard)