[Ocfs2-commits] khackel commits r904 - in trunk/src: . inc

svn-commits at oss.oracle.com svn-commits at oss.oracle.com
Thu May 6 16:31:07 CDT 2004


Author: khackel
Date: 2004-05-06 15:31:05 -0500 (Thu, 06 May 2004)
New Revision: 904

Modified:
   trunk/src/alloc.c
   trunk/src/inc/ocfs.h
   trunk/src/sysfile.c
Log:
remove useless system file stuff



Modified: trunk/src/alloc.c
===================================================================
--- trunk/src/alloc.c	2004-05-06 00:21:22 UTC (rev 903)
+++ trunk/src/alloc.c	2004-05-06 20:31:05 UTC (rev 904)
@@ -3930,7 +3930,7 @@
 	LOG_ENTRY();
 
 	/* read the alloc off disk */
-	offset = ((OCFS_VOL_BITMAP_FILE + osb->node_num) * osb->sect_size) + 
+	offset = ((OCFS_LOCAL_ALLOC_FILE + osb->node_num) * osb->sect_size) + 
 		osb->vol_layout.root_int_off;
 	status = ocfs_read_bh(osb, offset, &alloc_bh, 0, NULL);
 	if (status < 0) {
@@ -4042,7 +4042,7 @@
 
 	LOG_ENTRY_ARGS("(node_num = %d)\n", node_num);
 
-	offset = ((OCFS_VOL_BITMAP_FILE + node_num) * osb->sect_size) + 
+	offset = ((OCFS_LOCAL_ALLOC_FILE + node_num) * osb->sect_size) + 
 		osb->vol_layout.root_int_off;
 	status = ocfs_read_bh(osb, offset, &alloc_bh, 0, NULL);
 	if (status < 0) {

Modified: trunk/src/inc/ocfs.h
===================================================================
--- trunk/src/inc/ocfs.h	2004-05-06 00:21:22 UTC (rev 903)
+++ trunk/src/inc/ocfs.h	2004-05-06 20:31:05 UTC (rev 904)
@@ -312,8 +312,8 @@
 									    
 enum {
     OCFS_INVALID_SYSFILE = -1,
-    OCFS_VOL_MD_SYSFILE = 0,
-    OCFS_VOL_MD_LOG_SYSFILE,
+    OCFS_VOL_MD_SYSFILE = 0,		// unused in version 2
+    OCFS_VOL_MD_LOG_SYSFILE,		// unused in version 2
     OCFS_DIR_SYSFILE,
     OCFS_DIR_BM_SYSFILE,
     OCFS_FILE_EXTENT_SYSFILE,
@@ -323,19 +323,27 @@
     OCFS_VOL_BM_SYSFILE,
     OCFS_ORPHAN_DIR_SYSFILE,
     OCFS_JOURNAL_SYSFILE,
+    OCFS_INODE_SYSFILE,
+    OCFS_INODE_BM_SYSFILE,
+    OCFS_DIRENT_SYSFILE,
+    OCFS_DIRENT_BM_SYSFILE,
     OCFS_NUM_SYSFILES
 };
-#define OCFS_FILE_VOL_META_DATA      (OCFS_VOL_MD_SYSFILE         * OCFS_MAXIMUM_NODES)
-#define OCFS_FILE_VOL_LOG_FILE       (OCFS_VOL_MD_LOG_SYSFILE     * OCFS_MAXIMUM_NODES)
+#define OCFS_FILE_VOL_META_DATA      (OCFS_VOL_MD_SYSFILE         * OCFS_MAXIMUM_NODES)		// unused in version 2
+#define OCFS_FILE_VOL_LOG_FILE       (OCFS_VOL_MD_LOG_SYSFILE     * OCFS_MAXIMUM_NODES)		// unused in version 2
 #define OCFS_FILE_DIR_ALLOC          (OCFS_DIR_SYSFILE            * OCFS_MAXIMUM_NODES)
 #define OCFS_FILE_DIR_ALLOC_BITMAP   (OCFS_DIR_BM_SYSFILE         * OCFS_MAXIMUM_NODES)
 #define OCFS_FILE_FILE_ALLOC         (OCFS_FILE_EXTENT_SYSFILE    * OCFS_MAXIMUM_NODES)
 #define OCFS_FILE_FILE_ALLOC_BITMAP  (OCFS_FILE_EXTENT_BM_SYSFILE * OCFS_MAXIMUM_NODES)
-#define LOG_FILE_BASE_ID             (OCFS_RECOVER_LOG_SYSFILE    * OCFS_MAXIMUM_NODES)
-#define CLEANUP_FILE_BASE_ID         (OCFS_CLEANUP_LOG_SYSFILE    * OCFS_MAXIMUM_NODES)
-#define OCFS_VOL_BITMAP_FILE         (OCFS_VOL_BM_SYSFILE         * OCFS_MAXIMUM_NODES)
+#define LOG_FILE_BASE_ID             (OCFS_RECOVER_LOG_SYSFILE    * OCFS_MAXIMUM_NODES)		// unused in version 2
+#define CLEANUP_FILE_BASE_ID         (OCFS_CLEANUP_LOG_SYSFILE    * OCFS_MAXIMUM_NODES)		// unused in version 2
+#define OCFS_LOCAL_ALLOC_FILE        (OCFS_VOL_BM_SYSFILE         * OCFS_MAXIMUM_NODES)		// was OCFS_VOL_BITMAP_FILE
 #define OCFS_ORPHAN_DIR              (OCFS_ORPHAN_DIR_SYSFILE     * OCFS_MAXIMUM_NODES)
 #define OCFS_JOURNAL_FILE            (OCFS_JOURNAL_SYSFILE        * OCFS_MAXIMUM_NODES)
+#define OCFS_INODE_FILE              (OCFS_INODE_SYSFILE          * OCFS_MAXIMUM_NODES)
+#define OCFS_INODE_BITMAP            (OCFS_INODE_BM_SYSFILE       * OCFS_MAXIMUM_NODES)
+#define OCFS_DIRENT_FILE             (OCFS_DIRENT_SYSFILE         * OCFS_MAXIMUM_NODES)
+#define OCFS_DIRENT_BITMAP           (OCFS_DIRENT_BM_SYSFILE      * OCFS_MAXIMUM_NODES)
 
 
 #define SECTOR_BITS 9

Modified: trunk/src/sysfile.c
===================================================================
--- trunk/src/sysfile.c	2004-05-06 00:21:22 UTC (rev 903)
+++ trunk/src/sysfile.c	2004-05-06 20:31:05 UTC (rev 904)
@@ -55,22 +55,12 @@
 	__u64 tmplen;
 	__u64 tmpoff = 0;
 	struct buffer_head * fe_bh = NULL;
-	int flags = OCFS_BH_CACHED;
-	bool bWriteThru = false;
 
-	LOG_ENTRY_ARGS ("(FileId = %u, metadatafile = %u, offset = (%llu), "
-			"Length = (%llu))\n", FileId, 
-			OCFS_FILE_VOL_META_DATA + osb->node_num, Offset,
-			Length);
+	LOG_ENTRY_ARGS ("(FileId = %u, offset = (%llu), "
+			"Length = (%llu))\n", FileId, Offset, Length);
 
-	if ((FileId == (OCFS_FILE_VOL_LOG_FILE + osb->node_num)) ||
-	    (FileId == (OCFS_FILE_VOL_META_DATA + osb->node_num))) {
-		bWriteThru = true;
-		flags = 0;
-	}
-
 	status = ocfs_read_bh(osb, (FileId * osb->sect_size) + 
-			      osb->vol_layout.root_int_off, &fe_bh, flags, NULL);
+			      osb->vol_layout.root_int_off, &fe_bh, OCFS_BH_CACHED, NULL);
 	if (status < 0) {
 		LOG_ERROR_STATUS (status);
 		goto leave;
@@ -109,7 +99,7 @@
 		tmpoff = IoRuns[i].disk_off;
 		tmplen = IoRuns[i].byte_cnt;
 
-		status = ocfs_read_bhs(osb, tmpoff, tmplen, &(bhs[j]), flags, NULL);
+		status = ocfs_read_bhs(osb, tmpoff, tmplen, &(bhs[j]), OCFS_BH_CACHED, NULL);
 		if (status < 0) {
 			LOG_ERROR_STATUS (status);
 			goto leave;
@@ -201,17 +191,9 @@
 	ocfs_file_entry *fe = NULL;
 	__u64 offset;
 	struct buffer_head *fe_bh = NULL;
-	bool bWriteThru = false;
-	int flags = OCFS_BH_CACHED;
 
 	LOG_ENTRY_ARGS ("(FileId = %u)\n", FileId);
 
-	if ((FileId == (OCFS_FILE_VOL_LOG_FILE + osb->node_num)) ||
-	    (FileId == (OCFS_FILE_VOL_META_DATA + osb->node_num))) {
-		bWriteThru = true;
-		flags = 0;
-	}
-
 	*AllocSize = *Length = 0;
 
 	offset = (FileId * osb->sect_size) + osb->vol_layout.root_int_off;
@@ -257,10 +239,8 @@
 {
 	int status = 0;
 	__u64 actualDiskOffset = 0, actualLength = 0;
-	bool bWriteThru = false;
 	bool local_fe = false;
 	ocfs_file_entry *fe = NULL;
-	int flags = OCFS_BH_COND_CACHED;
 	__u64 alloc_size;
 	int numbhs, i;
 	char *data;
@@ -270,15 +250,9 @@
 
 	OCFS_ASSERT (osb);
 
-	if ((FileId == (OCFS_FILE_VOL_LOG_FILE + osb->node_num)) ||
-	    (FileId == (OCFS_FILE_VOL_META_DATA + osb->node_num))) {
-		bWriteThru = true;
-		flags = 0;  /* want to force everything out */
-	}
-
 	if (!fe_bh) {
 		local_fe = true;
-		status = ocfs_read_bh(osb, (FileId * osb->sect_size) + osb->vol_layout.root_int_off, &fe_bh, flags, NULL);
+		status = ocfs_read_bh(osb, (FileId * osb->sect_size) + osb->vol_layout.root_int_off, &fe_bh, OCFS_BH_COND_CACHED, NULL);
 		if (status < 0) {
 			LOG_ERROR_STATUS (status);
 			goto leave;
@@ -373,10 +347,8 @@
 	fe->alloc_size += actualLength;
 	fe->file_size = FileSize;
 
-	if (!bWriteThru) {
-		DISK_LOCK_CURRENT_MASTER (fe) = osb->node_num;
-		DISK_LOCK_FILE_LOCK (fe) = OCFS_DLM_ENABLE_CACHE_LOCK;
-	}
+	DISK_LOCK_CURRENT_MASTER (fe) = osb->node_num;
+	DISK_LOCK_FILE_LOCK (fe) = OCFS_DLM_ENABLE_CACHE_LOCK;
 
 	OCFS_BH_PUT_DATA(fe_bh);
 	fe = NULL;



More information about the Ocfs2-commits mailing list