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

[svn-commits at oss.oracle.com]

Author: khackel
Date: 2004-06-06 11:57:35 -0500 (Sun, 06 Jun 2004)
New Revision: 1017

Modified:
   branches/format-changes/src/ocfs.h
   branches/format-changes/src/sysfile.c
Log:
small change to shuffle system file stuff around


Modified: branches/format-changes/src/ocfs.h
===================================================================
--- branches/format-changes/src/ocfs.h	2004-06-06 09:02:56 UTC (rev 1016)
+++ branches/format-changes/src/ocfs.h	2004-06-06 16:57:35 UTC (rev 1017)
@@ -769,18 +769,6 @@
 }
 ocfs_extent_map;
 
-typedef struct _alloc_item
-{
-	enum { SLAB_ITEM, KMALLOC_ITEM, VMALLOC_ITEM } type;
-	void *address;
-	union {
-		int length;
-		void *slab;
-	} u;
-	struct list_head list;
-	char tag[30];
-}
-alloc_item;
 
 typedef struct _ocfs_obj_id
 {
@@ -789,31 +777,7 @@
 }
 ocfs_obj_id;
 
-typedef struct _ocfs_filldir
-{
-	__u8 fname[OCFS_MAX_FILENAME_LENGTH];
-	loff_t pos;
-	__u32 ino;
-} ocfs_filldir;
 
-/**************************************************************************
-**  Each file open instance is represented by a context control block.
-**  For each successful create/open request; a file object and a ocfs_file will
-**  be created.
-**  For open operations performed internally by the FSD, there may not
-**  exist file objects; but a ocfs_file will definitely be created.
-**  This structure must be quad-word aligned because it is zone allocated.
-**************************************************************************/
-typedef struct _ocfs_file
-{
-	ocfs_obj_id obj_id;
-	__u64 curr_byte_off;
-	__s64 curr_dir_off;
-	struct buffer_head **curr_dir_buf;
-	ocfs_filldir filldir;
-}
-ocfs_file;
-
 typedef struct _ocfs_super ocfs_super;
 typedef struct _ocfs_io_runs ocfs_io_runs;
 typedef struct _ocfs_lock_res ocfs_lock_res;
@@ -1050,9 +1014,10 @@
 enum {
 	GLOBAL_BITMAP_SYSTEM_INODE = 0,
 	GLOBAL_INODE_ALLOC_SYSTEM_INODE,
+	AUTOCONFIG_SYSTEM_INODE,
 	PUBLISH_SYSTEM_INODE,
 	VOTE_SYSTEM_INODE,
-	AUTOCONFIG_SYSTEM_INODE,
+	ORPHAN_DIR_SYSTEM_INODE,
 	EXTENT_ALLOC_SYSTEM_INODE,
 	EXTENT_ALLOC_BITMAP_SYSTEM_INODE,
 	INODE_ALLOC_SYSTEM_INODE,

Modified: branches/format-changes/src/sysfile.c
===================================================================
--- branches/format-changes/src/sysfile.c	2004-06-06 09:02:56 UTC (rev 1016)
+++ branches/format-changes/src/sysfile.c	2004-06-06 16:57:35 UTC (rev 1017)
@@ -56,9 +56,10 @@
 char *system_file_names[] = {
 	"global_bitmap",
 	"global_inode_alloc",
+	"autoconfig",
 	"publish",
 	"vote",
-	"autoconfig",
+	"orphan_dir",
 	"extent_alloc:%04d",
 	"extent_alloc_bitmap:%04d",
 	"inode_alloc:%04d",