---

yaml --- r: 40095 b: refs/heads/master c: e2057c5 h: refs/heads/master i: 40093: d2c5e35 40091: 4ec1360 40087: 7e3ced3 40079: ac2c1e5 40063: 4997629 v: v3
git-mirror · Oct 20, 2006 · bf042a5 · bf042a5
1 parent 8326cb9
commit bf042a5
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0effef776ff95b7a6d6e48a2ef407ecaa8c21f96
+refs/heads/master: e2057c5a63821e17c8a54dab6db680c77ce7ee6c
diff --git a/trunk/fs/ocfs2/file.c b/trunk/fs/ocfs2/file.c
@@ -30,6 +30,7 @@
 #include <linux/highmem.h>
 #include <linux/pagemap.h>
 #include <linux/uio.h>
+#include <linux/sched.h>
 
 #define MLOG_MASK_PREFIX ML_INODE
 #include <cluster/masklog.h>
@@ -691,6 +692,12 @@ static int ocfs2_zero_extend(struct inode *inode,
 		}
 
 		start_off += sb->s_blocksize;
+
+		/*
+		 * Very large extends have the potential to lock up
+		 * the cpu for extended periods of time.
+		 */
+		cond_resched();
 	}
 
 out: