[Ocfs2-commits] jlbec commits r1226 - trunk/src

[svn-commits at oss.oracle.com]

Author: jlbec
Date: 2004-06-29 20:08:10 -0500 (Tue, 29 Jun 2004)
New Revision: 1226

Modified:
   trunk/src/namei.c
   trunk/src/ocfs.h
   trunk/src/ocfs2_fs.h
   trunk/src/super.c
Log:

o OCFS2_INODE_SIGNATURE is more proper.



Modified: trunk/src/namei.c
===================================================================
--- trunk/src/namei.c	2004-06-30 00:00:47 UTC (rev 1225)
+++ trunk/src/namei.c	2004-06-30 01:08:10 UTC (rev 1226)
@@ -444,7 +444,7 @@
 		fe->i_links_count = 1;
 
 	fe->i_last_eb_blk = 0;
-	strcpy (fe->i_signature, OCFS2_FILE_ENTRY_SIGNATURE);
+	strcpy (fe->i_signature, OCFS2_INODE_SIGNATURE);
 	fe->i_flags |= OCFS2_VALID_FL;
 	DISK_LOCK(fe)->dl_seq_num = 0;
 	DISK_LOCK(fe)->dl_master = osb->node_num;

Modified: trunk/src/ocfs.h
===================================================================
--- trunk/src/ocfs.h	2004-06-30 00:00:47 UTC (rev 1225)
+++ trunk/src/ocfs.h	2004-06-30 01:08:10 UTC (rev 1226)
@@ -249,7 +249,7 @@
 
 /* sm - ocfs 1.0 fails to set fe->sig for dirs */
 #define  IS_VALID_FILE_ENTRY(ptr)     \
-	(!strcmp((ptr)->i_signature, OCFS2_FILE_ENTRY_SIGNATURE))
+	(!strcmp((ptr)->i_signature, OCFS2_INODE_SIGNATURE))
 #define  IS_VALID_EXTENT_BLOCK(ptr)  \
 	(!strcmp((ptr)->h_signature, OCFS2_EXTENT_BLOCK_SIGNATURE))
 

Modified: trunk/src/ocfs2_fs.h
===================================================================
--- trunk/src/ocfs2_fs.h	2004-06-30 00:00:47 UTC (rev 1225)
+++ trunk/src/ocfs2_fs.h	2004-06-30 01:08:10 UTC (rev 1226)
@@ -49,11 +49,12 @@
  * As OCFS2 has a minimum clustersize of 4K, it has a maximum blocksize
  * of 4K
  */
+#define OCFS2_MIN_BLOCKSIZE		512
 #define OCFS2_MAX_BLOCKSIZE		4096
 
 /* Object signatures */
 #define OCFS2_SUPER_BLOCK_SIGNATURE	"OCFSV2"
-#define OCFS2_FILE_ENTRY_SIGNATURE	"INODE01"
+#define OCFS2_INODE_SIGNATURE		"INODE01"
 #define OCFS2_EXTENT_BLOCK_SIGNATURE	"EXBLK01"
 
 /* Compatibility flags */

Modified: trunk/src/super.c
===================================================================
--- trunk/src/super.c	2004-06-30 00:00:47 UTC (rev 1225)
+++ trunk/src/super.c	2004-06-30 01:08:10 UTC (rev 1226)
@@ -819,11 +819,15 @@
 
 	/* may be > 512 */
 	*sector_size = bdev_hardsect_size(sb->s_bdev);
-	if (*sector_size > 4096) {
-		LOG_ERROR_ARGS("Hardware sector size too large: %d (max=4096)\n", *sector_size);
+	if (*sector_size > OCFS2_MAX_BLOCKSIZE) {
+		LOG_ERROR_ARGS("Hardware sector size too large: %d (max=%d)\n", *sector_size, OCFS2_MAX_BLOCKSIZE);
 		status = -EINVAL;
 		goto bail;
 	}
+
+	/* Can this really happen? */
+	if (*sector_size < OCFS2_MIN_BLOCKSIZE)
+		*sector_size = OCFS2_MIN_BLOCKSIZE;
 	
 	/* check block zero for old format */
 	status = ocfs2_get_sector(sb, bh, 0, *sector_size);