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

[svn-commits at oss.oracle.com]

Author: jlbec
Date: 2005-05-17 16:12:51 -0500 (Tue, 17 May 2005)
New Revision: 2262

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

o Move ip_mmu_private to ocfs2_inode_info.



Modified: branches/alloc_inode/fs/ocfs2/aops.c
===================================================================
--- branches/alloc_inode/fs/ocfs2/aops.c	2005-05-17 21:12:34 UTC (rev 2261)
+++ branches/alloc_inode/fs/ocfs2/aops.c	2005-05-17 21:12:51 UTC (rev 2262)
@@ -184,16 +184,16 @@
 		     OCFS2_I(inode)->ip_blkno);
 	}
 
-	if (vbo < OCFS_I(inode)->ip_mmu_private)
+	if (vbo < OCFS2_I(inode)->ip_mmu_private)
 		goto bail;
 	if (!create)
 		goto bail;
-	if (vbo != OCFS_I(inode)->ip_mmu_private) {
+	if (vbo != OCFS2_I(inode)->ip_mmu_private) {
 		mlog(ML_ERROR, "Uh-oh, vbo = %"MLFi64", i_size = %lld, "
 				"mmu = %lld, inode = %"MLFu64"\n",
 		     vbo,
 		     i_size_read(inode),
-		     OCFS_I(inode)->ip_mmu_private,
+		     OCFS2_I(inode)->ip_mmu_private,
 		     OCFS2_I(inode)->ip_blkno);
 		BUG();
 		err = -EIO;
@@ -201,7 +201,7 @@
 	}
 
 	set_buffer_new(bh_result);
-	OCFS_I(inode)->ip_mmu_private += inode->i_sb->s_blocksize;
+	OCFS2_I(inode)->ip_mmu_private += inode->i_sb->s_blocksize;
 
 bail:
 	if (err < 0)
@@ -249,7 +249,7 @@
 	mlog_entry("(0x%p, 0x%p, %u, %u)\n", file, page, from, to);
 
 	ret = cont_prepare_write(page, from, to, ocfs_get_block,
-		&(OCFS_I(page->mapping->host)->ip_mmu_private));
+		&(OCFS2_I(page->mapping->host)->ip_mmu_private));
 
 	mlog_exit(ret);
 

Modified: branches/alloc_inode/fs/ocfs2/file.c
===================================================================
--- branches/alloc_inode/fs/ocfs2/file.c	2005-05-17 21:12:34 UTC (rev 2261)
+++ branches/alloc_inode/fs/ocfs2/file.c	2005-05-17 21:12:51 UTC (rev 2262)
@@ -183,7 +183,7 @@
 		 * This leaves dirty data in holes.
 		 * Caveat Emptor.
 		 */
-		OCFS_I(inode)->ip_mmu_private = newsize;
+		OCFS2_I(inode)->ip_mmu_private = newsize;
 	} else {
 		int status = ocfs2_zero_extend(inode);
 		/*
@@ -373,7 +373,6 @@
 			u64 new_i_size)
 {
 	int status, grow;
-	ocfs_inode_private *oip = OCFS_I(inode);
 
 	mlog_entry_void();
 
@@ -389,10 +388,10 @@
 	}
 
 	/* FIXME: I think this should all be in the caller */
-	spin_lock(&oip->ip_lock);
+	spin_lock(&OCFS_I(inode)->ip_lock);
 	if (!grow)
-		oip->ip_mmu_private = i_size_read(inode);
-	spin_unlock(&oip->ip_lock);
+		OCFS2_I(inode)->ip_mmu_private = i_size_read(inode);
+	spin_unlock(&OCFS_I(inode)->ip_lock);
 
 bail:
 	mlog_exit(status);
@@ -556,7 +555,7 @@
 	int res = 0;
 
 	/* Start the zeroing of blocks */
-	if (i_size_read(inode) > OCFS_I(inode)->ip_mmu_private) {
+	if (i_size_read(inode) > OCFS2_I(inode)->ip_mmu_private) {
 		page = grab_cache_page(mapping,
 				       size >> PAGE_CACHE_SHIFT);
 		if (!page) {
@@ -1022,7 +1021,7 @@
 		spin_lock(&OCFS_I(inode)->ip_lock);
 		if (OCFS2_I(inode)->ip_flags & OCFS2_INODE_OPEN_DIRECT) {
 			/* This is a total broken hack for O_DIRECT crack */
-			OCFS_I(inode)->ip_mmu_private = i_size_read(inode);
+			OCFS2_I(inode)->ip_mmu_private = i_size_read(inode);
 		}
 		spin_unlock(&OCFS_I(inode)->ip_lock);
 		status = ocfs2_zero_extend(inode);

Modified: branches/alloc_inode/fs/ocfs2/inode.c
===================================================================
--- branches/alloc_inode/fs/ocfs2/inode.c	2005-05-17 21:12:34 UTC (rev 2261)
+++ branches/alloc_inode/fs/ocfs2/inode.c	2005-05-17 21:12:51 UTC (rev 2262)
@@ -225,9 +225,6 @@
 	init_rwsem(&i->ip_alloc_sem);
 	init_MUTEX(&(i->ip_io_sem));
 
-	/* These should be set in read_inode2. */
-	i->ip_mmu_private = 0LL;
-
 	i->ip_flags |= OCFS_INODE_INITIALIZED;
 	return 0;
 } /* ocfs_inode_init_private */
@@ -326,7 +323,7 @@
 		    inode->i_fop = &ocfs_fops;
 		    inode->i_op = &ocfs_file_iops;
 		    i_size_write(inode, fe->i_size);
-		    OCFS_I(inode)->ip_mmu_private = inode->i_size;
+		    OCFS2_I(inode)->ip_mmu_private = inode->i_size;
 		    break;
 	    case S_IFDIR:
 		    atomic_set(GET_INODE_CLEAN_SEQ(inode), atomic_read(&osb->clean_buffer_seq));
@@ -954,15 +951,14 @@
 void ocfs_refresh_inode(struct inode *inode, 
 			ocfs2_dinode *fe)
 {
-	ocfs_inode_private *oip = OCFS_I(inode);
 	ocfs_super *osb = OCFS2_SB(inode->i_sb);
 
-	spin_lock(&oip->ip_lock);
+	spin_lock(&OCFS_I(inode)->ip_lock);
 
 	OCFS2_I(inode)->ip_clusters = fe->i_clusters;
 	i_size_write(inode, fe->i_size);
 	if (S_ISREG(inode->i_mode)) {
-		oip->ip_mmu_private = i_size_read(inode);
+		OCFS2_I(inode)->ip_mmu_private = i_size_read(inode);
 	}
 	inode->i_nlink = fe->i_links_count;
 	inode->i_uid = fe->i_uid;
@@ -977,7 +973,7 @@
 	inode->i_mtime.tv_sec = fe->i_mtime;
 	inode->i_ctime.tv_sec = fe->i_ctime;
 
-	spin_unlock(&oip->ip_lock);
+	spin_unlock(&OCFS_I(inode)->ip_lock);
 }				/* ocfs_refresh_inode */
 
 

Modified: branches/alloc_inode/fs/ocfs2/ocfs.h
===================================================================
--- branches/alloc_inode/fs/ocfs2/ocfs.h	2005-05-17 21:12:34 UTC (rev 2261)
+++ branches/alloc_inode/fs/ocfs2/ocfs.h	2005-05-17 21:12:51 UTC (rev 2262)
@@ -207,7 +207,6 @@
 
 	/* These fields are protected by ip_lock */
 	spinlock_t	  ip_lock;
-	loff_t		ip_mmu_private;
 	struct ocfs2_extent_map ip_map;
 	struct list_head ip_io_markers;