diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h
index 5d5ae6f44510a712aa45f622bbd0fb6ee92cbeea..48d02bea4984460ce6aee906f2cdcea181c11244 100644
--- a/fs/ext4/ext4.h
+++ b/fs/ext4/ext4.h
@@ -700,6 +700,7 @@ enum {
 #define EXT4_FREE_BLOCKS_NOFREE_FIRST_CLUSTER	0x0010
 #define EXT4_FREE_BLOCKS_NOFREE_LAST_CLUSTER	0x0020
 #define EXT4_FREE_BLOCKS_RERESERVE_CLUSTER      0x0040
+#define EXT4_FREE_BLOCKS_DONT_WAIT_JOURNAL      0x0080
 
 /*
  * ioctl commands
diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c
index e42a78170109ea6a132392b4bedbf69ebfe501b8..b1eb4ea2c68a1e85195272410e6552dce5011e86 100644
--- a/fs/ext4/extents.c
+++ b/fs/ext4/extents.c
@@ -1294,7 +1294,8 @@ static int ext4_ext_split(handle_t *handle, struct inode *inode,
 			if (!ablocks[i])
 				continue;
 			ext4_free_blocks(handle, inode, NULL, ablocks[i], 1,
-					 EXT4_FREE_BLOCKS_METADATA);
+					 EXT4_FREE_BLOCKS_METADATA |
+					 EXT4_FREE_BLOCKS_DONT_WAIT_JOURNAL);
 		}
 	}
 	kfree(ablocks);
@@ -4329,6 +4330,7 @@ int ext4_ext_map_blocks(handle_t *handle, struct inode *inode,
 			ext4_discard_preallocations(inode, 0);
 			if (flags & EXT4_GET_BLOCKS_DELALLOC_RESERVE)
 				fb_flags = EXT4_FREE_BLOCKS_NO_QUOT_UPDATE;
+			fb_flags |= EXT4_FREE_BLOCKS_DONT_WAIT_JOURNAL;
 			ext4_free_blocks(handle, inode, NULL, newblock,
 					 EXT4_C2B(sbi, allocated_clusters),
 					 fb_flags);
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
index 44018d1da27ec54c26c28d61f1dc4792352ea890..ebb794fed3a7b9168b7688d5f4de0d1ddefa0c93 100644
--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
@@ -2479,7 +2479,7 @@ static int mpage_map_and_submit_extent(handle_t *handle,
 			 * is non-zero, a commit should free up blocks.
 			 */
 			if ((err == -ENOMEM) ||
-			    (err == -ENOSPC && ext4_count_free_clusters(sb))) {
+			    (err == -ENOSPC && EXT4_SB(sb)->s_mb_free_pending)) {
 				if (progress)
 					goto update_disksize;
 				return err;
diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c
index fd8464aadf00fd4edf79ab67e8cf89ae31b64f03..3870dff5f2e76487add26869b63056e31b68091f 100644
--- a/fs/ext4/mballoc.c
+++ b/fs/ext4/mballoc.c
@@ -5498,8 +5498,9 @@ void ext4_free_blocks(handle_t *handle, struct inode *inode,
 	 * consistency guarantees.
 	 */
 	if (ext4_handle_valid(handle) &&
-	    ((flags & EXT4_FREE_BLOCKS_METADATA) ||
-	     !ext4_should_writeback_data(inode))) {
+	    (((flags & EXT4_FREE_BLOCKS_METADATA) ||
+	     !ext4_should_writeback_data(inode)) &&
+	     !(flags & EXT4_FREE_BLOCKS_DONT_WAIT_JOURNAL))) {
 		struct ext4_free_data *new_entry;
 		/*
 		 * We use __GFP_NOFAIL because ext4_free_blocks() is not allowed