Skip to content

Commit

Permalink
dm thin: fix metadata dev resize detection
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Alasdair G Kergon committed May 19, 2013
1 parent f722406 commit 610bba8
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions drivers/md/dm-thin.c
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand All @@ -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;

Expand Down

0 comments on commit 610bba8

Please sign in to comment.