From bf042a5ce0ae34ab84129d1c3ff337b7d15cfe42 Mon Sep 17 00:00:00 2001
From: Mark Fasheh <mark.fasheh@oracle.com>
Date: Tue, 3 Oct 2006 17:53:05 -0700
Subject: [PATCH] --- yaml --- r: 40095 b: refs/heads/master c:
 e2057c5a63821e17c8a54dab6db680c77ce7ee6c h: refs/heads/master i:   40093:
 d2c5e35b707f8f2a62b6dbcc41de346ebc0b5a05   40091:
 4ec13605501ef895dc4b899a5456af787ded69d1   40087:
 7e3ced3cb25dec46138987994fb744297be1c57a   40079:
 ac2c1e56e5d2a2b9641f9ca4a8ccb72d373e10f9   40063:
 4997629593cdc535bde1ddea418a6c75197865cf v: v3

---
 [refs]                | 2 +-
 trunk/fs/ocfs2/file.c | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 7edaf5cbae2c..384dd524bf9e 100644
--- 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
index b499c329257b..1be74c4e7814 100644
--- 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: