[Ocfs2-commits] khackel commits r1065 - branches/format-changes/src

[svn-commits at oss.oracle.com]

Author: khackel
Date: 2004-06-12 04:24:54 -0500 (Sat, 12 Jun 2004)
New Revision: 1065

Modified:
   branches/format-changes/src/inode.c
   branches/format-changes/src/ocfs.h
   branches/format-changes/src/ocfs2_fs.h
Log:
shuffle some stuff around for user tools, fix a bug in inode.c

Modified: branches/format-changes/src/inode.c
===================================================================
--- branches/format-changes/src/inode.c	2004-06-12 09:16:06 UTC (rev 1064)
+++ branches/format-changes/src/inode.c	2004-06-12 09:24:54 UTC (rev 1065)
@@ -1039,6 +1039,7 @@
 	ocfs_super *osb;
 	__s64 vbo, lbo;
 	int readflags = OCFS_BH_CACHED;
+	char *buf;
 
 	osb = OCFS_SB(inode->i_sb);
 	vbo = (__s64) block << inode->i_sb->s_blocksize_bits;
@@ -1092,7 +1093,7 @@
 		if (fatal)
 			goto fail;
 
-		char *buf = OCFS_BH_GET_DATA_WRITE(bh);
+		buf = OCFS_BH_GET_DATA_WRITE(bh);
 		memset(buf, 0, osb->sect_size);
 		OCFS_BH_PUT_DATA(bh);
 		fatal = ocfs_journal_dirty(handle, bh);	

Modified: branches/format-changes/src/ocfs.h
===================================================================
--- branches/format-changes/src/ocfs.h	2004-06-12 09:16:06 UTC (rev 1064)
+++ branches/format-changes/src/ocfs.h	2004-06-12 09:24:54 UTC (rev 1065)
@@ -489,11 +489,7 @@
 				DLOCK_FLAG_LAST_UPDATE)
 
 
-#define MAX_VOL_ID_LENGTH		16
-#define MAX_VOL_LABEL_LEN		64
-#define MAX_CLUSTER_NAME_LEN		64
 
-
 #define OCFS_IPC_DEFAULT_PORT   7001
 
 		
@@ -907,22 +903,6 @@
 	atomic_t ext_extends;
 } ocfs_alloc_stats;
 
-enum {
-	GLOBAL_BITMAP_SYSTEM_INODE = 0,
-	GLOBAL_INODE_ALLOC_SYSTEM_INODE,
-	GLOBAL_INODE_ALLOC_BITMAP_SYSTEM_INODE,
-	AUTOCONFIG_SYSTEM_INODE,
-	PUBLISH_SYSTEM_INODE,
-	VOTE_SYSTEM_INODE,
-	ORPHAN_DIR_SYSTEM_INODE,
-	EXTENT_ALLOC_SYSTEM_INODE,
-	EXTENT_ALLOC_BITMAP_SYSTEM_INODE,
-	INODE_ALLOC_SYSTEM_INODE,
-	INODE_ALLOC_BITMAP_SYSTEM_INODE,
-	JOURNAL_SYSTEM_INODE,
-	NUM_SYSTEM_INODES
-};
-
 extern char *system_file_names[];
 
 

Modified: branches/format-changes/src/ocfs2_fs.h
===================================================================
--- branches/format-changes/src/ocfs2_fs.h	2004-06-12 09:16:06 UTC (rev 1064)
+++ branches/format-changes/src/ocfs2_fs.h	2004-06-12 09:24:54 UTC (rev 1065)
@@ -44,6 +44,29 @@
 	
 #define OCFS2_MAX_FILENAME_LENGTH       255
 
+#define MAX_VOL_ID_LENGTH		16
+#define MAX_VOL_LABEL_LEN		64
+#define MAX_CLUSTER_NAME_LEN		64
+
+
+
+enum {
+	GLOBAL_BITMAP_SYSTEM_INODE = 0,
+	GLOBAL_INODE_ALLOC_SYSTEM_INODE,
+	GLOBAL_INODE_ALLOC_BITMAP_SYSTEM_INODE,
+	AUTOCONFIG_SYSTEM_INODE,
+	PUBLISH_SYSTEM_INODE,
+	VOTE_SYSTEM_INODE,
+	ORPHAN_DIR_SYSTEM_INODE,
+	EXTENT_ALLOC_SYSTEM_INODE,
+	EXTENT_ALLOC_BITMAP_SYSTEM_INODE,
+	INODE_ALLOC_SYSTEM_INODE,
+	INODE_ALLOC_BITMAP_SYSTEM_INODE,
+	JOURNAL_SYSTEM_INODE,
+	NUM_SYSTEM_INODES
+};
+
+
 /*
  * OCFS2 directory file types.  Only the low 3 bits are used.  The
  * other bits are reserved for now.
@@ -247,7 +270,7 @@
 /* Actual on-disk length specified by rec_len */
 };
 
-
+#ifdef __KERNEL__
 static inline int ocfs_extent_recs_per_inode(struct super_block *sb)
 {
 	int size;
@@ -267,5 +290,26 @@
 
 	return size / sizeof(struct _ocfs2_extent_rec);
 }
+#else
+static inline int ocfs_extent_recs_per_inode(__u32 blocksize)
+{
+	int size;
 
+	size = blocksize -
+		offsetof(struct _ocfs2_dinode, id2.i_list.l_recs);
+
+	return size / sizeof(struct _ocfs2_extent_rec);
+}
+
+static inline int ocfs_extent_recs_per_eb(__u32 blocksize)
+{
+	int size;
+
+	size = blocksize -
+		offsetof(struct _ocfs2_extent_block, h_list.l_recs);
+
+	return size / sizeof(struct _ocfs2_extent_rec);
+}
+#endif
+
 #endif  /* _OCFS2_FS_H */