Pull device mapper fix from Alasdair Kergon: "A patch to fix metadata resizing with device-mapper thin devices." * tag 'dm-3.10-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-dm: dm thin: fix metadata dev resize detection
Unified · Split
| @@ -2188,7 +2188,7 @@ static int maybe_resize_metadata_dev(struct dm_target *ti, bool *need_commit) · 2187 unmodified lines | |||
| 2188 | 2188 | ||
| 2189 | *need_commit = false; | 2189 | *need_commit = false; |
| 2190 | 2190 | ||
| 2191 | metadata_dev_size = get_metadata_dev_size(pool->md_dev); | 2191 | metadata_dev_size = get_metadata_dev_size_in_blocks(pool->md_dev); |
| 2192 | 2192 | ||
| 2193 | r = dm_pool_get_metadata_dev_size(pool->pmd, &sb_metadata_dev_size); | 2193 | r = dm_pool_get_metadata_dev_size(pool->pmd, &sb_metadata_dev_size); |
| 2194 | if (r) { | 2194 | if (r) { |
| @@ -2197,7 +2197,7 @@ static int maybe_resize_metadata_dev(struct dm_target *ti, bool *need_commit) · 2 unmodified lines | |||
| 2197 | } | 2197 | } |
| 2198 | 2198 | ||
| 2199 | if (metadata_dev_size < sb_metadata_dev_size) { | 2199 | if (metadata_dev_size < sb_metadata_dev_size) { |
| 2200 | DMERR("metadata device (%llu sectors) too small: expected %llu", | 2200 | DMERR("metadata device (%llu blocks) too small: expected %llu", |
| 2201 | metadata_dev_size, sb_metadata_dev_size); | 2201 | metadata_dev_size, sb_metadata_dev_size); |
| 2202 | return -EINVAL; | 2202 | return -EINVAL; |
| 2203 | 2203 | ||