|
@@ -4815,18 +4815,12 @@ do_more:
|
|
|
/*
|
|
|
* 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;
|