Commit 343cd4fb authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 130901ba 610bba8b

drivers/md/dm-thin.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -2188,7 +2188,7 @@ static int maybe_resize_metadata_dev(struct dm_target *ti, bool *need_commit) 




	*need_commit = false;

	*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);

	r = dm_pool_get_metadata_dev_size(pool->pmd, &sb_metadata_dev_size);

	if (r) {

	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) {

	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);

		      metadata_dev_size, sb_metadata_dev_size);

		return -EINVAL;

		return -EINVAL;

CRA Git | Maintained and supported by SUSTech CRA and CCSE