block: floor the discard granularity to the physical block size

[linux-2.6-microblaze.git] / block / blk-settings.c

diff --git a/block/blk-settings.c b/block/blk-settings.c
index d993d20..06ea91e 100644 (file)
--- a/block/blk-settings.c
+++ b/block/blk-settings.c
@@ -342,6 +342,9 @@ void blk_queue_physical_block_size(struct request_queue *q, unsigned int size)
        if (q->limits.physical_block_size < q->limits.logical_block_size)
                q->limits.physical_block_size = q->limits.logical_block_size;
 
+       if (q->limits.discard_granularity < q->limits.physical_block_size)
+               q->limits.discard_granularity = q->limits.physical_block_size;
+
        if (q->limits.io_min < q->limits.physical_block_size)
                q->limits.io_min = q->limits.physical_block_size;
 }