From d46d0f00df49f7b96b74bcce779714ad2a133ed3 Mon Sep 17 00:00:00 2001
From: Lukas Czerner <lczerner@redhat.com>
Date: Sun, 10 Mar 2013 22:28:09 -0400
Subject: [PATCH] --- yaml --- r: 361593 b: refs/heads/master c:
 bb8b20ed94bc69120e31399c43cb336300dea109 h: refs/heads/master i:   361591:
 55a85b6caf6f533e0fdd56ccb3becce84558c8c4 v: v3

---
 [refs]                  | 2 +-
 trunk/fs/ext4/inode.c   | 2 +-
 trunk/fs/ext4/mballoc.c | 8 ++------
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 9b307b8c2958..aabcf1d89030 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e3d85c366089015805f175324bb1780249f44669
+refs/heads/master: bb8b20ed94bc69120e31399c43cb336300dea109
diff --git a/trunk/fs/ext4/inode.c b/trunk/fs/ext4/inode.c
index 117a9e7aa4a0..48fc023ab0a2 100644
--- a/trunk/fs/ext4/inode.c
+++ b/trunk/fs/ext4/inode.c
@@ -1352,7 +1352,7 @@ static int ext4_da_reserve_space(struct inode *inode, ext4_lblk_t lblock)
 		ei->i_da_metadata_calc_last_lblock = save_last_lblock;
 		spin_unlock(&ei->i_block_reservation_lock);
 		if (ext4_should_retry_alloc(inode->i_sb, &retries)) {
-			yield();
+			cond_resched();
 			goto repeat;
 		}
 		dquot_release_reservation_block(inode, EXT4_C2B(sbi, 1));
diff --git a/trunk/fs/ext4/mballoc.c b/trunk/fs/ext4/mballoc.c
index 75e05f3a730f..8b2ea9f75004 100644
--- a/trunk/fs/ext4/mballoc.c
+++ b/trunk/fs/ext4/mballoc.c
@@ -3692,11 +3692,7 @@ ext4_mb_discard_group_preallocations(struct super_block *sb,
 	if (free < needed && busy) {
 		busy = 0;
 		ext4_unlock_group(sb, group);
-		/*
-		 * Yield the CPU here so that we don't get soft lockup
-		 * in non preempt case.
-		 */
-		yield();
+		cond_resched();
 		goto repeat;
 	}
 
@@ -4246,7 +4242,7 @@ ext4_fsblk_t ext4_mb_new_blocks(handle_t *handle,
 			ext4_claim_free_clusters(sbi, ar->len, ar->flags)) {
 
 			/* let others to free the space */
-			yield();
+			cond_resched();
 			ar->len = ar->len >> 1;
 		}
 		if (!ar->len) {