From 1ba4471a6a51fe6640e0c20f859125bd76ad7e3f Mon Sep 17 00:00:00 2001
From: Kurt Hackel <kurt.hackel@oracle.com>
Date: Mon, 1 May 2006 14:27:41 -0700
Subject: [PATCH] --- yaml --- r: 30700 b: refs/heads/master c:
 f85cd47a5825b77a146bad6870b2ddcf08415c13 h: refs/heads/master v: v3

---
 [refs]                         | 2 +-
 trunk/fs/ocfs2/dlm/dlmthread.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index a7b60e9c03ec..90cb58188487 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ad8100e0d20e0123def9f83c040b68c96c8638f0
+refs/heads/master: f85cd47a5825b77a146bad6870b2ddcf08415c13
diff --git a/trunk/fs/ocfs2/dlm/dlmthread.c b/trunk/fs/ocfs2/dlm/dlmthread.c
index c1c10fd1a5a7..0c822f3ffb05 100644
--- a/trunk/fs/ocfs2/dlm/dlmthread.c
+++ b/trunk/fs/ocfs2/dlm/dlmthread.c
@@ -731,7 +731,7 @@ static int dlm_thread(void *data)
 
 		/* yield and continue right away if there is more work to do */
 		if (!n) {
-			yield();
+			cond_resched();
 			continue;
 		}