[Ocfs2-tools-commits] mfasheh commits r1168 - in trunk: libocfs2/include mkfs.ocfs2 ocfs2console/ocfs2interface tunefs.ocfs2

[svn-commits@oss.oracle.com]

Author: mfasheh
Date: 2006-02-24 19:24:10 -0600 (Fri, 24 Feb 2006)
New Revision: 1168

Modified:
   trunk/libocfs2/include/ocfs2_fs.h
   trunk/mkfs.ocfs2/mkfs.c
   trunk/ocfs2console/ocfs2interface/ocfs2module.c
   trunk/tunefs.ocfs2/tunefs.c
Log:
* remove the OCFS2_MAX_JOURNAL_SIZE limit - there's no limit actually
  enforced by the kernel.



Modified: trunk/libocfs2/include/ocfs2_fs.h
===================================================================
--- trunk/libocfs2/include/ocfs2_fs.h	2006-02-24 23:55:16 UTC (rev 1167)
+++ trunk/libocfs2/include/ocfs2_fs.h	2006-02-25 01:24:10 UTC (rev 1168)
@@ -138,7 +138,6 @@
 
 /* Journal limits (in bytes) */
 #define OCFS2_MIN_JOURNAL_SIZE		(4 * 1024 * 1024)
-#define OCFS2_MAX_JOURNAL_SIZE		(500 * 1024 * 1024)
 
 struct ocfs2_system_inode_info {
 	char	*si_name;

Modified: trunk/mkfs.ocfs2/mkfs.c
===================================================================
--- trunk/mkfs.ocfs2/mkfs.c	2006-02-24 23:55:16 UTC (rev 1167)
+++ trunk/mkfs.ocfs2/mkfs.c	2006-02-25 01:24:10 UTC (rev 1168)
@@ -724,14 +724,11 @@
 			ret = get_number(arg, &val);
 
 			if (ret ||
-			    val < OCFS2_MIN_JOURNAL_SIZE ||
-			    val > OCFS2_MAX_JOURNAL_SIZE) {
+			    val < OCFS2_MIN_JOURNAL_SIZE) {
 				com_err(progname, 0,
 					"Invalid journal size: %s\nSize must "
-					"be between %d and %d bytes",
-					arg,
-					OCFS2_MIN_JOURNAL_SIZE,
-					OCFS2_MAX_JOURNAL_SIZE);
+					"be greater than %d bytes",
+					arg, OCFS2_MIN_JOURNAL_SIZE);
 				exit(1);
 			}
 

Modified: trunk/ocfs2console/ocfs2interface/ocfs2module.c
===================================================================
--- trunk/ocfs2console/ocfs2interface/ocfs2module.c	2006-02-24 23:55:16 UTC (rev 1167)
+++ trunk/ocfs2console/ocfs2interface/ocfs2module.c	2006-02-25 01:24:10 UTC (rev 1168)
@@ -1090,7 +1090,6 @@
   ADD_INT_CONSTANT (MAX_VOL_LABEL_LEN);
 
   ADD_INT_CONSTANT (MIN_JOURNAL_SIZE);
-  ADD_INT_CONSTANT (MAX_JOURNAL_SIZE);
 
   ADD_INT_CONSTANT (FIRST_ONLINE_SYSTEM_INODE);
   ADD_INT_CONSTANT (LAST_GLOBAL_SYSTEM_INODE);

Modified: trunk/tunefs.ocfs2/tunefs.c
===================================================================
--- trunk/tunefs.ocfs2/tunefs.c	2006-02-24 23:55:16 UTC (rev 1167)
+++ trunk/tunefs.ocfs2/tunefs.c	2006-02-25 01:24:10 UTC (rev 1168)
@@ -202,14 +202,12 @@
 			ret = get_number(arg, &val);
 
 			if (ret ||
-			    val < OCFS2_MIN_JOURNAL_SIZE ||
-			    val > OCFS2_MAX_JOURNAL_SIZE) {
+			    val < OCFS2_MIN_JOURNAL_SIZE) {
 				com_err(progname, 0,
 					"Invalid journal size: %s\nSize must "
-					"be between %d and %d bytes",
+					"be greater than %d bytes",
 					arg,
-					OCFS2_MIN_JOURNAL_SIZE,
-					OCFS2_MAX_JOURNAL_SIZE);
+					OCFS2_MIN_JOURNAL_SIZE);
 				exit(1);
 			}