[Ocfs2-commits] jlbec commits r2299 - branches/alloc_inode/fs/ocfs2

[svn-commits at oss.oracle.com]

Author: jlbec
Date: 2005-05-19 23:56:29 -0500 (Thu, 19 May 2005)
New Revision: 2299

Modified:
   branches/alloc_inode/fs/ocfs2/inode.c
   branches/alloc_inode/fs/ocfs2/journal.c
   branches/alloc_inode/fs/ocfs2/namei.c
   branches/alloc_inode/fs/ocfs2/ocfs.h
   branches/alloc_inode/fs/ocfs2/super.c
Log:

o Move ip_next_orphan and ip_dir_start_lookup to ocfs2_inode_info.



Modified: branches/alloc_inode/fs/ocfs2/inode.c
===================================================================
--- branches/alloc_inode/fs/ocfs2/inode.c	2005-05-20 01:24:28 UTC (rev 2298)
+++ branches/alloc_inode/fs/ocfs2/inode.c	2005-05-20 04:56:29 UTC (rev 2299)
@@ -214,7 +214,6 @@
 	memset(i, 0, sizeof(ocfs_inode_private));
 
 	i->ip_flags = 0;
-	i->ip_next_orphan = NULL;
 
 	init_rwsem(&i->ip_alloc_sem);
 	init_MUTEX(&(i->ip_io_sem));
@@ -780,6 +779,7 @@
 	oi->ip_flags = 0;
 	oi->ip_created_trans = 0;
 	oi->ip_last_trans = 0;
+	oi->ip_dir_start_lookup = 0;
 	oi->ip_blkno = 0ULL;
 
 	/* clean out the inode private ... why?! */

Modified: branches/alloc_inode/fs/ocfs2/journal.c
===================================================================
--- branches/alloc_inode/fs/ocfs2/journal.c	2005-05-20 01:24:28 UTC (rev 2298)
+++ branches/alloc_inode/fs/ocfs2/journal.c	2005-05-20 04:56:29 UTC (rev 2299)
@@ -1450,7 +1450,7 @@
 
 			mlog(0, "queue orphan %"MLFu64"\n",
 			     OCFS2_I(iter)->ip_blkno);
-			OCFS_I(iter)->ip_next_orphan = inode;
+			OCFS2_I(iter)->ip_next_orphan = inode;
 			inode = iter;
 		}
 		brelse(bh);
@@ -1467,7 +1467,7 @@
 		mlog(0, "iput orphan %"MLFu64"\n",
 		     OCFS2_I(inode)->ip_blkno);
 
-		iter = OCFS_I(inode)->ip_next_orphan;
+		iter = OCFS2_I(inode)->ip_next_orphan;
 
 		spin_lock(&OCFS2_I(inode)->ip_lock);
 		OCFS2_I(inode)->ip_orphaned_slot = slot;

Modified: branches/alloc_inode/fs/ocfs2/namei.c
===================================================================
--- branches/alloc_inode/fs/ocfs2/namei.c	2005-05-20 01:24:28 UTC (rev 2298)
+++ branches/alloc_inode/fs/ocfs2/namei.c	2005-05-20 04:56:29 UTC (rev 2299)
@@ -1891,7 +1891,7 @@
 	sb = dir->i_sb;
 
 	nblocks = i_size_read(dir) >> sb->s_blocksize_bits;
-	start = OCFS_I(dir)->ip_dir_start_lookup;
+	start = OCFS2_I(dir)->ip_dir_start_lookup;
 	if (start >= nblocks)
 		start = 0;
 	block = start;
@@ -1936,7 +1936,7 @@
 		i = search_dirblock(bh, dir, name, namelen,
 				    block << sb->s_blocksize_bits, res_dir);
 		if (i == 1) {
-			OCFS_I(dir)->ip_dir_start_lookup = block;
+			OCFS2_I(dir)->ip_dir_start_lookup = block;
 			ret = bh;
 			goto cleanup_and_exit;
 		} else {

Modified: branches/alloc_inode/fs/ocfs2/ocfs.h
===================================================================
--- branches/alloc_inode/fs/ocfs2/ocfs.h	2005-05-20 01:24:28 UTC (rev 2298)
+++ branches/alloc_inode/fs/ocfs2/ocfs.h	2005-05-20 04:56:29 UTC (rev 2299)
@@ -201,11 +201,6 @@
 	struct semaphore  ip_io_sem;
 
 	u32             ip_flags; /* see below */
-
-	/* protected by recovery_lock. */
-	struct inode      *ip_next_orphan;
-
-	u32 		  ip_dir_start_lookup;
 } ocfs_inode_private;
 
 /* 'flags' flags. */

Modified: branches/alloc_inode/fs/ocfs2/super.c
===================================================================
--- branches/alloc_inode/fs/ocfs2/super.c	2005-05-20 01:24:28 UTC (rev 2298)
+++ branches/alloc_inode/fs/ocfs2/super.c	2005-05-20 04:56:29 UTC (rev 2299)
@@ -555,9 +555,9 @@
 		INIT_LIST_HEAD(&oi->ip_handle_list);
 		INIT_LIST_HEAD(&oi->ip_io_markers);
 		oi->ip_handle = NULL;
-		oi->ip_next_orphan = NULL;
 		oi->ip_created_trans = 0;
 		oi->ip_last_trans = 0;
+		oi->ip_dir_start_lookup = 0;
 		
 		init_rwsem(&oi->ip_alloc_sem);
 		init_MUTEX(&(oi->ip_io_sem));