Unverified Commit 8536c35b authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!1380 [sync] PR-1351: dm thin: fix deadlock when swapping to thin device 

Merge Pull Request from: @openeuler-sync-bot 
 

Origin pull request: 
https://gitee.com/openeuler/kernel/pulls/1351 
 
PR sync from: Li Lingfeng <lilingfeng3@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/7LQ6EXG6AUW5V5QHM5OPQF4H2EUFST7H/ 
 
 
Link:https://gitee.com/openeuler/kernel/pulls/1380

 

Reviewed-by: default avatarYu Kuai <yukuai3@huawei.com>
Reviewed-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents 3c4533bd f0727f67

drivers/md/dm-thin.c

+2 −0
Original line number Diff line number Diff line
@@ -3379,6 +3379,7 @@ static int pool_ctr(struct dm_target *ti, unsigned argc, char **argv) 
	pt->low_water_blocks = low_water_blocks;

	pt->adjusted_pf = pt->requested_pf = pf;

	ti->num_flush_bios = 1;

	ti->limit_swap_bios = true;



	/*

	 * Only need to enable discards if the pool should pass
@@ -4256,6 +4257,7 @@ static int thin_ctr(struct dm_target *ti, unsigned argc, char **argv) 
		goto bad;



	ti->num_flush_bios = 1;

	ti->limit_swap_bios = true;

	ti->flush_supported = true;

	ti->per_io_data_size = sizeof(struct dm_thin_endio_hook);