Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9b68392a authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman Committed by Treehugger Robot
Browse files

Revert "dm thin: fix deadlock when swapping to thin device" 



This reverts commit 84e13235 which is
commit 9bbf5feecc7eab2c370496c1c161bbfe62084028 upstream.

It is not needed as the commit it fixes was already reverted from the
android-4.19-stable branch.

Fixes: 84e13235 ("dm thin: fix deadlock when swapping to thin device")
Change-Id: I6ba31fef9123cbdfd131372463c90975618fa314
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parent a73cc414

drivers/md/dm-thin.c

+0 −2
Original line number Diff line number Diff line
@@ -3365,7 +3365,6 @@ 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
@@ -4246,7 +4245,6 @@ 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);