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

[svn-commits at oss.oracle.com]

Author: khackel
Date: 2004-05-05 16:03:31 -0500 (Wed, 05 May 2004)
New Revision: 895

Modified:
   trunk/src/alloc.c
   trunk/src/inc/io.h
   trunk/src/inc/ocfs.h
   trunk/src/inode.c
   trunk/src/namei.c
Log:
change extent[0].disk_off to use fe->child_dirnode



Modified: trunk/src/alloc.c
===================================================================
--- trunk/src/alloc.c	2004-05-05 17:57:18 UTC (rev 894)
+++ trunk/src/alloc.c	2004-05-05 21:03:31 UTC (rev 895)
@@ -3156,7 +3156,7 @@
 
 	LOG_ENTRY ();
 
-	currentDirNode = fe->extents[0].disk_off;
+	currentDirNode = fe->child_dirnode;
 
 	size = OCFS_SECTOR_SIZE;
 
@@ -3230,7 +3230,7 @@
 
 	fe = (ocfs_file_entry *)OCFS_BH_GET_DATA_READ(fe_bh); /* read */
 	if (fe->attribs & OCFS_ATTRIB_DIRECTORY)
-		offset = fe->extents[0].disk_off;
+		offset = fe->child_dirnode;
 	else
 		offset = fe->this_sector;
 	OCFS_BH_PUT_DATA(fe_bh);

Modified: trunk/src/inc/io.h
===================================================================
--- trunk/src/inc/io.h	2004-05-05 17:57:18 UTC (rev 894)
+++ trunk/src/inc/io.h	2004-05-05 21:03:31 UTC (rev 895)
@@ -327,9 +327,9 @@
 				printk("uh oh!  fe->this_sector (%u) != blocknr (%lu)\n",
 				       (__u32)(fe->this_sector>>9), bh->b_blocknr);
 				BUG();
-			} else if (fe->extents[0].disk_off >> 9 == 4720) {
+			} else if (fe->child_dirnode >> 9 == 4720) {
 				OCFS_DO_HEX_DUMP(bh);
-				printk("uh oh!  fe->extents[0].disk_off recurses!!!\n");
+				printk("uh oh!  fe->child_dirnode recurses!!!\n");
 				BUG();
 			}
 		} else if (bh->b_blocknr == 4720) {

Modified: trunk/src/inc/ocfs.h
===================================================================
--- trunk/src/inc/ocfs.h	2004-05-05 17:57:18 UTC (rev 894)
+++ trunk/src/inc/ocfs.h	2004-05-05 21:03:31 UTC (rev 895)
@@ -1740,7 +1740,7 @@
 	struct list_head  i_list;
 	unsigned long     i_ino;
 	__u64             i_voteoff;/* fe->this_sector OR
-				     * fe->extents[0].disk_off */
+				     * fe->child_dirnode */
 	__u64             i_feoff;  /* used only for directory inodes,
 				     * points to parent fe of
 				     * dirnode. for files i_voteoff == i_feoff,

Modified: trunk/src/inode.c
===================================================================
--- trunk/src/inode.c	2004-05-05 17:57:18 UTC (rev 894)
+++ trunk/src/inode.c	2004-05-05 21:03:31 UTC (rev 895)
@@ -195,7 +195,7 @@
 		feoff = fe->this_sector;
 		/* need voteoff too. */
 		if (fe->attribs & OCFS_ATTRIB_DIRECTORY)
-			voteoff = fe->extents[0].disk_off;
+			voteoff = fe->child_dirnode;
 		else
 			voteoff = fe->this_sector;
 		OCFS_BH_PUT_DATA(fe_bh);

Modified: trunk/src/namei.c
===================================================================
--- trunk/src/namei.c	2004-05-05 17:57:18 UTC (rev 894)
+++ trunk/src/namei.c	2004-05-05 21:03:31 UTC (rev 895)
@@ -196,7 +196,7 @@
 	fe = (ocfs_file_entry *) OCFS_BH_GET_DATA_READ(new_fe_bh); /* read */
 
 	file_off = fe->this_sector;
-	dirnode_off = fe->extents[0].disk_off;
+	dirnode_off = fe->child_dirnode;
 
 	parent_off = GET_INODE_VOTEOFF(dir);
 
@@ -364,7 +364,7 @@
 		}
 
 		fe->alloc_size = osb->vol_layout.dir_node_size;
-		fe->extents[0].disk_off = bitmapOffset;
+		fe->child_dirnode = bitmapOffset;
 		fe->file_size = osb->vol_layout.dir_node_size;
 		fe->next_del = INVALID_DIR_NODE_INDEX;
 		
@@ -939,7 +939,7 @@
 	 * dirnode instead. */
 	oldfe = (ocfs_file_entry *) OCFS_BH_GET_DATA_READ(oldfe_bh); /* read */
 	if (oldfe->attribs & OCFS_ATTRIB_DIRECTORY) {
-		oldfe_lockid = oldfe->extents[0].disk_off;
+		oldfe_lockid = oldfe->child_dirnode;
 		oldfe_flags = FLAG_DIR;
 	} else 
 		oldfe_lockid = oldfe->this_sector;
@@ -981,7 +981,7 @@
 	if (kill_newfe) {
 		newfe = (ocfs_file_entry *) OCFS_BH_GET_DATA_READ(newfe_bh); /* read */
 		if (newfe->attribs & OCFS_ATTRIB_DIRECTORY) {
-			newfe_lockid = newfe->extents[0].disk_off;
+			newfe_lockid = newfe->child_dirnode;
 			newfe_flags = FLAG_DIR;
 		} else 
 			newfe_lockid = newfe->this_sector;
@@ -1063,7 +1063,7 @@
 		tmpfe->modify_time = OCFS_CURRENT_TIME;
 
 		if (tmpfe->attribs & OCFS_ATTRIB_DIRECTORY)
-			tmpoff = tmpfe->extents[0].disk_off;
+			tmpoff = tmpfe->child_dirnode;
 		else
 			tmpoff = tmpfe->this_sector;
 
@@ -1110,7 +1110,7 @@
 			 * a directory, but the fe offset does... */
 			ocfs_inode_rehash(&osb->inode_hash, 
 					  tmpoff,
-					  tmpfe->extents[0].disk_off, 
+					  tmpfe->child_dirnode,
 					  tmpfe->this_sector);
 		} else {
 			SET_INODE_VOTEOFF(old_inode, 
@@ -1400,7 +1400,7 @@
 	fe = (ocfs_file_entry *)OCFS_BH_GET_DATA_READ(fe_bh); /* read */
 	dir_node_ptr = fe->dir_node_ptr;
 	if (fe->attribs & OCFS_ATTRIB_DIRECTORY) {
-		lockId = fe->extents[0].disk_off;
+		lockId = fe->child_dirnode;
 		lockFlags = (FLAG_DIR | FLAG_FILE_RENAME);
 
 		status = ocfs_read_bh(osb, lockId, &lockbh, OCFS_BH_CACHED, 
@@ -1573,7 +1573,7 @@
 		 * done implicitely by locking it. */
 		fe = (ocfs_file_entry *) OCFS_BH_GET_DATA_READ(fe_bh); /* read */
 		if (fe->attribs & OCFS_ATTRIB_DIRECTORY) {
-			status = ocfs_read_bh(osb, fe->extents[0].disk_off, 
+			status = ocfs_read_bh(osb, fe->child_dirnode,
 					      &lock_bh, OCFS_BH_CACHED, inode);
 			if (status < 0) {
 				LOG_ERROR_STATUS(status);
@@ -1619,7 +1619,7 @@
 	fe = (ocfs_file_entry *)OCFS_BH_GET_DATA_READ(fe_bh); /* read */
 
 	if (fe->attribs & OCFS_ATTRIB_DIRECTORY) {
-		lock_id = fe->extents[0].disk_off;
+		lock_id = fe->child_dirnode;
 		lockFlags = (FLAG_FILE_DELETE | FLAG_DIR);
 	} else {
 		lock_id = fe->this_sector;