[Ocfs2-commits] mfasheh commits r1244 - trunk/src

[svn-commits at oss.oracle.com]

Author: mfasheh
Date: 2004-07-07 15:57:50 -0500 (Wed, 07 Jul 2004)
New Revision: 1244

Modified:
   trunk/src/journal.c
   trunk/src/ocfs_journal.h
Log:
* move the commit cache interval constant to the header file to make
  it easier to find.

* change our checkpoint / lock release interval from 2 seconds to 8
  seconds.



Modified: trunk/src/journal.c
===================================================================
--- trunk/src/journal.c	2004-07-07 03:41:28 UTC (rev 1243)
+++ trunk/src/journal.c	2004-07-07 20:57:50 UTC (rev 1244)
@@ -982,6 +982,7 @@
 	return;
 }
 
+#define OCFS_DEFAULT_COMMIT_INTERVAL 	(HZ * 5)
 /* 
  * Setup the journal using the journal system file
  */
@@ -1683,10 +1684,6 @@
 	return (status);
 }				/* ocfs_reset_publish */
 
-
-#define OCFS_COMMIT_MISS_MAX  5
-#define OCFS_COMMIT_INTERVAL  2000 // in ms
-
 int ocfs_commit_thread(void *arg)
 {
 	int status = 0, misses = 0, finish = 0;
@@ -1706,7 +1703,8 @@
 	       !(osb->osb_flags & OCFS_OSB_FLAGS_BEING_DISMOUNTED)) {
 
 		status = ocfs_wait (osb->flush_event,
-			    atomic_read (&osb->flush_event_woken), OCFS_COMMIT_INTERVAL);
+			    atomic_read (&osb->flush_event_woken), 
+				    OCFS_CHECKPOINT_INTERVAL);
 		
 		atomic_set (&osb->flush_event_woken, 0);
 

Modified: trunk/src/ocfs_journal.h
===================================================================
--- trunk/src/ocfs_journal.h	2004-07-07 03:41:28 UTC (rev 1243)
+++ trunk/src/ocfs_journal.h	2004-07-07 20:57:50 UTC (rev 1244)
@@ -33,11 +33,9 @@
 #include <linux/jbd.h>
 
 #define OCFS_JOURNAL_CURRENT_VERSION	1
-#define OCFS_DEFAULT_COMMIT_INTERVAL 	(HZ * 5)
+#define OCFS_CHECKPOINT_INTERVAL        8000
 #define OCFS_JOURNAL_DEFAULT_SIZE	(8 * ONE_MEGA_BYTE)
 
-#undef 	OCFS_JOURNAL_USE_CB
-
 enum ocfs_journal_state {
 	OCFS_JOURNAL_FREE = 0,
 	OCFS_JOURNAL_LOADED,