diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-19 12:35:30 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-19 12:35:30 -0700 |
| commit | 343cd4fb412c3c7d4bc2de3cd456011b2ab338e1 (patch) | |
| tree | 2122e4db0a3b33ab8dcf315b234d45e9dfee6781 /drivers | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs (diff) | |
| parent | dm thin: fix metadata dev resize detection (diff) | |
| download | linux-dev-343cd4fb412c3c7d4bc2de3cd456011b2ab338e1.tar.xz linux-dev-343cd4fb412c3c7d4bc2de3cd456011b2ab338e1.zip | |
Merge tag 'dm-3.10-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-dm
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
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/md/dm-thin.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/md/dm-thin.c b/drivers/md/dm-thin.c index 759cffc45cab..88f2f802d528 100644 --- a/drivers/md/dm-thin.c +++ b/drivers/md/dm-thin.c @@ -2188,7 +2188,7 @@ static int maybe_resize_metadata_dev(struct dm_target *ti, bool *need_commit) *need_commit = false; - metadata_dev_size = get_metadata_dev_size(pool->md_dev); + metadata_dev_size = get_metadata_dev_size_in_blocks(pool->md_dev); r = dm_pool_get_metadata_dev_size(pool->pmd, &sb_metadata_dev_size); if (r) { @@ -2197,7 +2197,7 @@ static int maybe_resize_metadata_dev(struct dm_target *ti, bool *need_commit) } if (metadata_dev_size < sb_metadata_dev_size) { - DMERR("metadata device (%llu sectors) too small: expected %llu", + DMERR("metadata device (%llu blocks) too small: expected %llu", metadata_dev_size, sb_metadata_dev_size); return -EINVAL; |