diff options
| author | David S. Miller <davem@davemloft.net> | 2013-05-25 01:48:28 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-05-25 01:48:28 +0200 |
| commit | e6ff4c75f9095f61b3a66c2a78e47b62864022dd (patch) | |
| tree | 425ea9463cbec0b1975b8a33d9a56817143055d0 /drivers/md/dm-thin.c | |
| parent | be2net: refactor HW workarounds in be_xmit() (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-fixes (diff) | |
| download | linux-e6ff4c75f9095f61b3a66c2a78e47b62864022dd.tar.xz linux-e6ff4c75f9095f61b3a66c2a78e47b62864022dd.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Merge net into net-next because some upcoming net-next changes
build on top of bug fixes that went into net.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/md/dm-thin.c')
| -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; |