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

Commit 7444a072 authored by Michal Hocko's avatar Michal Hocko Committed by Theodore Ts'o
Browse files

ext4: replace open coded nofail allocation in ext4_free_blocks() 



ext4_free_blocks is looping around the allocation request and mimics
__GFP_NOFAIL behavior without any allocation fallback strategy. Let's
remove the open coded loop and replace it with __GFP_NOFAIL. Without the
flag the allocator has no way to find out never-fail requirement and
cannot help in any way.

Signed-off-by: default avatarMichal Hocko <mhocko@suse.cz>
Signed-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
Cc: stable@vger.kernel.org
parent 8974fec7

fs/ext4/mballoc.c

+5 −11
Original line number Diff line number Diff line
@@ -4815,18 +4815,12 @@ void ext4_free_blocks(handle_t *handle, struct inode *inode, 
		/*

		 * blocks being freed are metadata. these blocks shouldn't

		 * be used until this transaction is committed

		 *

		 * We use __GFP_NOFAIL because ext4_free_blocks() is not allowed

		 * to fail.

		 */

	retry:

		new_entry = kmem_cache_alloc(ext4_free_data_cachep, GFP_NOFS);

		if (!new_entry) {

			/*

			 * We use a retry loop because

			 * ext4_free_blocks() is not allowed to fail.

			 */

			cond_resched();

			congestion_wait(BLK_RW_ASYNC, HZ/50);

			goto retry;

		}

		new_entry = kmem_cache_alloc(ext4_free_data_cachep,

				GFP_NOFS|__GFP_NOFAIL);

		new_entry->efd_start_cluster = bit;

		new_entry->efd_group = block_group;

		new_entry->efd_count = count_clusters;