Commit cbffe14c authored by Luo Meng's avatar Luo Meng Committed by Zheng Zengkai
Browse files

Revert "dm space maps: don't reset space map allocation cursor when committing" 

hulk inclusion
category: bugfix
bugzilla: 185894, https://gitee.com/openeuler/kernel/issues/I4SJ8H?from=project-issue


CVE: NA

-----------------------------------------------

This reverts commit b0d9aeb4.

This commit b0d9aeb4 ("dm space maps: don't reset space map allocation
cursor when committing") change the way to find free block.

But when use ramdisk(not support discard) for thin-pool,and storage
over-commitment. Then constantly create and delete file, can find block
in thin-pool, but can't find block in ramdisk.

So need revert this patch.

Signed-off-by: default avatarLuo Meng <luomeng12@huawei.com>
Reviewed-by: default avatarZhang Yi <yi.zhang@huawei.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parent b88ceab5

drivers/md/persistent-data/dm-space-map-disk.c

+1 −8
Original line number Diff line number Diff line
@@ -171,14 +171,6 @@ static int sm_disk_new_block(struct dm_space_map *sm, dm_block_t *b) 
	 * Any block we allocate has to be free in both the old and current ll.

	 */

	r = sm_ll_find_common_free_block(&smd->old_ll, &smd->ll, smd->begin, smd->ll.nr_blocks, b);

	if (r == -ENOSPC) {

		/*

		 * There's no free block between smd->begin and the end of the metadata device.

		 * We search before smd->begin in case something has been freed.

		 */

		r = sm_ll_find_common_free_block(&smd->old_ll, &smd->ll, 0, smd->begin, b);

	}



	if (r)

		return r;
@@ -207,6 +199,7 @@ static int sm_disk_commit(struct dm_space_map *sm) 
		return r;



	memcpy(&smd->old_ll, &smd->ll, sizeof(smd->old_ll));

	smd->begin = 0;

	smd->nr_allocated_this_transaction = 0;



	r = sm_disk_get_nr_free(sm, &nr_free);

drivers/md/persistent-data/dm-space-map-metadata.c

+1 −8
Original line number Diff line number Diff line
@@ -452,14 +452,6 @@ static int sm_metadata_new_block_(struct dm_space_map *sm, dm_block_t *b) 
	 * Any block we allocate has to be free in both the old and current ll.

	 */

	r = sm_ll_find_common_free_block(&smm->old_ll, &smm->ll, smm->begin, smm->ll.nr_blocks, b);

	if (r == -ENOSPC) {

		/*

		 * There's no free block between smm->begin and the end of the metadata device.

		 * We search before smm->begin in case something has been freed.

		 */

		r = sm_ll_find_common_free_block(&smm->old_ll, &smm->ll, 0, smm->begin, b);

	}



	if (r)

		return r;
@@ -511,6 +503,7 @@ static int sm_metadata_commit(struct dm_space_map *sm) 
		return r;



	memcpy(&smm->old_ll, &smm->ll, sizeof(smm->old_ll));

	smm->begin = 0;

	smm->allocated_this_transaction = 0;



	return 0;