diff options
| author | Alasdair G Kergon <agk@redhat.com> | 2013-05-19 18:57:50 +0100 |
|---|---|---|
| committer | Alasdair G Kergon <agk@redhat.com> | 2013-05-19 18:57:50 +0100 |
| commit | 610bba8b9372597967aefdc8d90661d2ab248802 (patch) | |
| tree | 85f53a32606d8082cc26f13cd681acdccf2cfa5b | |
| parent | f722406faae2d073cc1d01063d1123c35425939e (diff) | |
| download | linux-3.10-610bba8b9372597967aefdc8d90661d2ab248802.tar.gz linux-3.10-610bba8b9372597967aefdc8d90661d2ab248802.tar.bz2 linux-3.10-610bba8b9372597967aefdc8d90661d2ab248802.zip | |
dm thin: fix metadata dev resize detection
Fix detection of the need to resize the dm thin metadata device.
The code incorrectly tried to extend the metadata device when it
didn't need to due to a merging error with patch 24347e9 ("dm thin:
detect metadata device resizing").
device-mapper: transaction manager: couldn't open metadata space map
device-mapper: thin metadata: tm_open_with_sm failed
device-mapper: thin: aborting transaction failed
device-mapper: thin: switching pool to failure mode
Signed-off-by: Alasdair G Kergon <agk@redhat.com>
| -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 759cffc45ca..88f2f802d52 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; |