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

[svn-commits at oss.oracle.com]

Author: mfasheh
Date: 2004-10-13 19:57:32 -0500 (Wed, 13 Oct 2004)
New Revision: 1569

Modified:
   trunk/src/journal.c
   trunk/src/ocfs2_fs.h
   trunk/src/ocfs_journal.h
Log:
* don't error on non 8-meg journals anymore.



Modified: trunk/src/journal.c
===================================================================
--- trunk/src/journal.c	2004-10-13 23:51:47 UTC (rev 1568)
+++ trunk/src/journal.c	2004-10-14 00:57:32 UTC (rev 1569)
@@ -857,11 +857,9 @@
 	}
 	fe = (ocfs2_dinode *) bh->b_data;
 
-	/* should be exactly eight megs.  need to run tuneocfs otherwise. */
-	if (fe->i_size != OCFS_JOURNAL_DEFAULT_SIZE) {
-		LOG_ERROR_ARGS("Journal file size (%llu) is not the default (%u).  "
-			       "You must run tuneocfs to add a journal for this node.\n",
-			       fe->i_size, OCFS_JOURNAL_DEFAULT_SIZE);
+	if (fe->i_size <  OCFS2_MIN_JOURNAL_SIZE) {
+		LOG_ERROR_ARGS("Journal file size (%llu) is too small!",
+			       fe->i_size);
 		status = -EINVAL;
 		goto done;
 	}

Modified: trunk/src/ocfs2_fs.h
===================================================================
--- trunk/src/ocfs2_fs.h	2004-10-13 23:51:47 UTC (rev 1568)
+++ trunk/src/ocfs2_fs.h	2004-10-14 00:57:32 UTC (rev 1569)
@@ -109,6 +109,7 @@
 
 #define ONE_MEGA_BYTE           	(1 * 1024 * 1024)   /* in bytes */
 #define OCFS2_DEFAULT_JOURNAL_SIZE	(8 * ONE_MEGA_BYTE)
+#define OCFS2_MIN_JOURNAL_SIZE		(4 * ONE_MEGA_BYTE)
 
 
 /* System file index */

Modified: trunk/src/ocfs_journal.h
===================================================================
--- trunk/src/ocfs_journal.h	2004-10-13 23:51:47 UTC (rev 1568)
+++ trunk/src/ocfs_journal.h	2004-10-14 00:57:32 UTC (rev 1569)
@@ -31,7 +31,6 @@
 
 #define OCFS_JOURNAL_CURRENT_VERSION	1
 #define OCFS_CHECKPOINT_INTERVAL        8000
-#define OCFS_JOURNAL_DEFAULT_SIZE	(8 * ONE_MEGA_BYTE)
 
 enum ocfs_journal_state {
 	OCFS_JOURNAL_FREE = 0,