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

[svn-commits at oss.oracle.com]

Author: jlbec
Date: 2005-05-17 19:44:32 -0500 (Tue, 17 May 2005)
New Revision: 2270

Modified:
   branches/alloc_inode/fs/ocfs2/inode.c
   branches/alloc_inode/fs/ocfs2/mmap.h
   branches/alloc_inode/fs/ocfs2/ocfs.h
Log:

o Move ip_io_marker to ocfs2_inode_info.



Modified: branches/alloc_inode/fs/ocfs2/inode.c
===================================================================
--- branches/alloc_inode/fs/ocfs2/inode.c	2005-05-18 00:19:37 UTC (rev 2269)
+++ branches/alloc_inode/fs/ocfs2/inode.c	2005-05-18 00:44:32 UTC (rev 2270)
@@ -216,8 +216,6 @@
 	i->ip_flags = 0;
 	atomic_set(&i->ip_clean_buffer_seq, 0);
 	spin_lock_init(&i->ip_lock);
-	ocfs2_extent_map_init(inode);
-	INIT_LIST_HEAD(&i->ip_io_markers);
 	i->ip_next_orphan = NULL;
 
 	init_rwsem(&i->ip_alloc_sem);
@@ -751,7 +749,7 @@
 	if (oi->ip_blkno == -1)
 		BUG();
 
-	OCFS_ASSERT(list_empty(&OCFS_I(inode)->ip_io_markers));
+	OCFS_ASSERT(list_empty(&oi->ip_io_markers));
 
 	/* blkno == 0 if this inode is newly created and hasn't been
 	 * filled in yet. */

Modified: branches/alloc_inode/fs/ocfs2/mmap.h
===================================================================
--- branches/alloc_inode/fs/ocfs2/mmap.h	2005-05-18 00:19:37 UTC (rev 2269)
+++ branches/alloc_inode/fs/ocfs2/mmap.h	2005-05-18 00:44:32 UTC (rev 2270)
@@ -29,10 +29,11 @@
 				       ocfs2_io_marker *task)
 {
 	ocfs_inode_private *oip = OCFS_I(inode);
+	struct ocfs2_inode_info *oi = OCFS2_I(inode);
 
 	task->io_task = current;
 	spin_lock(&oip->ip_lock);
-	list_add(&task->io_list, &oip->ip_io_markers);
+	list_add(&task->io_list, &oi->ip_io_markers);
 	spin_unlock(&oip->ip_lock);
 }
 
@@ -52,11 +53,12 @@
 {
 	int ret = 0;
 	ocfs_inode_private *oip = OCFS_I(inode);
+	struct ocfs2_inode_info *oi = OCFS2_I(inode);
 	struct list_head *p;
 	ocfs2_io_marker *tmp;
 
 	spin_lock(&oip->ip_lock);
-	list_for_each(p, &oip->ip_io_markers) {
+	list_for_each(p, &oi->ip_io_markers) {
 		tmp = list_entry(p, ocfs2_io_marker, io_list);
 		if (tmp->io_task == task) {
 			ret = 1;

Modified: branches/alloc_inode/fs/ocfs2/ocfs.h
===================================================================
--- branches/alloc_inode/fs/ocfs2/ocfs.h	2005-05-18 00:19:37 UTC (rev 2269)
+++ branches/alloc_inode/fs/ocfs2/ocfs.h	2005-05-18 00:44:32 UTC (rev 2270)
@@ -200,7 +200,6 @@
 
 	/* These fields are protected by ip_lock */
 	spinlock_t	  ip_lock;
-	struct list_head ip_io_markers;
 
 	struct semaphore  ip_io_sem;