summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorKurt Hackel <kurt.hackel@oracle.com>2006-05-01 14:27:41 -0700
committerMark Fasheh <mark.fasheh@oracle.com>2006-06-26 14:43:13 -0700
commitf85cd47a5825b77a146bad6870b2ddcf08415c13 (patch)
treeac27e5c432e30d296769071b5f7c88b9af970593 /fs
parentad8100e0d20e0123def9f83c040b68c96c8638f0 (diff)
downloadlinux-3.10-f85cd47a5825b77a146bad6870b2ddcf08415c13.tar.gz
linux-3.10-f85cd47a5825b77a146bad6870b2ddcf08415c13.tar.bz2
linux-3.10-f85cd47a5825b77a146bad6870b2ddcf08415c13.zip
ocfs2: use cond_resched() in dlm_thread()
yield() does not yield. cond_resched() does. Signed-off-by: Kurt Hackel <kurt.hackel@oracle.com> Signed-off-by: Mark Fasheh <mark.fasheh@oracle.com>
Diffstat (limited to 'fs')
-rw-r--r--fs/ocfs2/dlm/dlmthread.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ocfs2/dlm/dlmthread.c b/fs/ocfs2/dlm/dlmthread.c
index c1c10fd1a5a..0c822f3ffb0 100644
--- a/fs/ocfs2/dlm/dlmthread.c
+++ b/fs/ocfs2/dlm/dlmthread.c
@@ -731,7 +731,7 @@ in_progress:
/* yield and continue right away if there is more work to do */
if (!n) {
- yield();
+ cond_resched();
continue;
}