[Ocfs2-commits] mfasheh commits r2766 - branches/ocfs2-1.2/fs/ocfs2

[svn-commits@oss.oracle.com]

Author: mfasheh
Signed-off-by: zab
Date: 2006-02-17 13:24:24 -0600 (Fri, 17 Feb 2006)
New Revision: 2766

Modified:
   branches/ocfs2-1.2/fs/ocfs2/journal.c
   branches/ocfs2-1.2/fs/ocfs2/journal.h
Log:
* backport git 745ae8ba29e729ec922393fa4d9448c385673599 to the 1.2 branch:

[PATCH] ocfs2: only checkpoint journal when asked to

Disable automatic checkpointing of the journal - this is a relic from
older ocfs2 days. Worth quite a bit of performance on longer running single
node tests.

Signed-off-by: zab



Modified: branches/ocfs2-1.2/fs/ocfs2/journal.c
===================================================================
--- branches/ocfs2-1.2/fs/ocfs2/journal.c	2006-02-14 22:19:09 UTC (rev 2765)
+++ branches/ocfs2-1.2/fs/ocfs2/journal.c	2006-02-17 19:24:24 UTC (rev 2766)
@@ -1576,10 +1576,9 @@
 	while (!(kthread_should_stop() &&
 		 atomic_read(&journal->j_num_trans) == 0)) {
 
-		wait_event_interruptible_timeout(osb->checkpoint_event,
-						 atomic_read(&journal->j_num_trans)
-						 || kthread_should_stop(),
-						 OCFS2_CHECKPOINT_INTERVAL);
+		wait_event_interruptible(osb->checkpoint_event,
+					 atomic_read(&journal->j_num_trans)
+					 || kthread_should_stop());
 
 		status = ocfs2_commit_cache(osb);
 		if (status < 0)

Modified: branches/ocfs2-1.2/fs/ocfs2/journal.h
===================================================================
--- branches/ocfs2-1.2/fs/ocfs2/journal.h	2006-02-14 22:19:09 UTC (rev 2765)
+++ branches/ocfs2-1.2/fs/ocfs2/journal.h	2006-02-17 19:24:24 UTC (rev 2766)
@@ -29,8 +29,6 @@
 #include <linux/fs.h>
 #include <linux/jbd.h>
 
-#define OCFS2_CHECKPOINT_INTERVAL        (8 * HZ)
-
 enum ocfs2_journal_state {
 	OCFS2_JOURNAL_FREE = 0,
 	OCFS2_JOURNAL_LOADED,