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

Commit 53fdcf99 authored by Lukas Czerner's avatar Lukas Czerner Committed by Theodore Ts'o
Browse files

ext4: don't hold spinlock while calling ext4_issue_discard() 



We can't hold the block group spinlock because we ext4_issue_discard()
calls wait and hence can get rescheduled.

Google-Bug-Id: 3017678

Signed-off-by: default avatarLukas Czerner <lczerner@redhat.com>
Signed-off-by: default avatar"Theodore Ts'o" <tytso@mit.edu>
parent 58298709

fs/ext4/mballoc.c

+2 −2
Original line number Diff line number Diff line
@@ -4696,12 +4696,12 @@ do_more: 
		 * with group lock held. generate_buddy look at

		 * them with group lock_held

		 */

		if (test_opt(sb, DISCARD))

			ext4_issue_discard(sb, block_group, bit, count);

		ext4_lock_group(sb, block_group);

		mb_clear_bits(bitmap_bh->b_data, bit, count);

		mb_free_blocks(inode, &e4b, bit, count);

		ext4_mb_return_to_preallocation(inode, &e4b, block, count);

		if (test_opt(sb, DISCARD))

			ext4_issue_discard(sb, block_group, bit, count);

	}



	ret = ext4_free_blks_count(sb, gdp) + count;