aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Fasheh <mark.fasheh@oracle.com>2006-10-03 17:53:05 -0700
committerMark Fasheh <mark.fasheh@oracle.com>2006-10-20 15:27:48 -0700
commite2057c5a63821e17c8a54dab6db680c77ce7ee6c (patch)
tree411465feea60aafd3bacbaec2fffb42af6e7bfe2
parent0effef776ff95b7a6d6e48a2ef407ecaa8c21f96 (diff)
downloadkernel_samsung_tuna-e2057c5a63821e17c8a54dab6db680c77ce7ee6c.zip
kernel_samsung_tuna-e2057c5a63821e17c8a54dab6db680c77ce7ee6c.tar.gz
kernel_samsung_tuna-e2057c5a63821e17c8a54dab6db680c77ce7ee6c.tar.bz2
ocfs2: cond_resched() in ocfs2_zero_extend()
The loop within ocfs2_zero_extend() can execute for a long time, causing spurious soft lockup warnings. Signed-off-by: Mark Fasheh <mark.fasheh@oracle.com>
-rw-r--r--fs/ocfs2/file.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/fs/ocfs2/file.c b/fs/ocfs2/file.c
index b499c32..1be74c4 100644
--- a/fs/ocfs2/file.c
+++ b/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: