diff options
| author | Lukas Czerner <lczerner@redhat.com> | 2014-06-11 12:28:43 -0400 |
|---|---|---|
| committer | Mike Snitzer <snitzer@redhat.com> | 2014-06-11 16:56:12 -0400 |
| commit | 09869de57ed2728ae3c619803932a86cb0e2c4f8 (patch) | |
| tree | ab74c6c4b5a60a374e8544ad32198f916e373db0 | |
| parent | adcc44472bacb227ebc0b1a8876efa5302474338 (diff) | |
| download | linux-09869de57ed2728ae3c619803932a86cb0e2c4f8.tar.gz linux-09869de57ed2728ae3c619803932a86cb0e2c4f8.tar.bz2 linux-09869de57ed2728ae3c619803932a86cb0e2c4f8.zip | |
dm thin: update discard_granularity to reflect the thin-pool blocksize
DM thinp already checks whether the discard_granularity of the data
device is a factor of the thin-pool block size. But when using the
dm-thin-pool's discard passdown support, DM thinp was not selecting the
max of the underlying data device's discard_granularity and the
thin-pool's block size.
Update set_discard_limits() to set discard_granularity to the max of
these values. This enables blkdev_issue_discard() to properly align the
discards that are sent to the DM thin device on a full block boundary.
As such each discard will now cover an entire DM thin-pool block and the
block will be reclaimed.
Reported-by: Zdenek Kabelac <zkabelac@redhat.com>
Signed-off-by: Lukas Czerner <lczerner@redhat.com>
Signed-off-by: Mike Snitzer <snitzer@redhat.com>
Cc: stable@vger.kernel.org
| -rw-r--r-- | drivers/md/dm-thin.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/md/dm-thin.c b/drivers/md/dm-thin.c index a0bdd562e026..fc9c848a60c9 100644 --- a/drivers/md/dm-thin.c +++ b/drivers/md/dm-thin.c @@ -3094,7 +3094,8 @@ static void set_discard_limits(struct pool_c *pt, struct queue_limits *limits) */ if (pt->adjusted_pf.discard_passdown) { data_limits = &bdev_get_queue(pt->data_dev->bdev)->limits; - limits->discard_granularity = data_limits->discard_granularity; + limits->discard_granularity = max(data_limits->discard_granularity, + pool->sectors_per_block << SECTOR_SHIFT); } else limits->discard_granularity = pool->sectors_per_block << SECTOR_SHIFT; } |