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

[svn-commits at oss.oracle.com]

Author: jlbec
Date: 2005-05-14 01:45:46 -0500 (Sat, 14 May 2005)
New Revision: 2246

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

o Move ip_open_cnt to struct ocfs2_inode_info as ip_open_count.



Modified: branches/alloc_inode/fs/ocfs2/file.c
===================================================================
--- branches/alloc_inode/fs/ocfs2/file.c	2005-05-14 06:00:10 UTC (rev 2245)
+++ branches/alloc_inode/fs/ocfs2/file.c	2005-05-14 06:45:46 UTC (rev 2246)
@@ -98,7 +98,7 @@
 	status = -EACCES;
 
 	spin_lock(&oip->ip_lock);
-	if (oip->ip_open_cnt &&
+	if (oi->ip_open_count &&
 	    !ocfs2_valid_open(mode, 
 			      oi->ip_flags & OCFS2_INODE_OPEN_DIRECT)) {
 		spin_unlock(&oip->ip_lock);
@@ -108,7 +108,7 @@
 	if (mode & O_DIRECT)
 		oi->ip_flags |= OCFS2_INODE_OPEN_DIRECT;
 
-	oip->ip_open_cnt++;
+	oi->ip_open_count++;
 	spin_unlock(&oip->ip_lock);
 	status = 0;
 leave:
@@ -126,7 +126,7 @@
 		       file->f_dentry->d_name.name);
 
 	spin_lock(&oip->ip_lock);
-	if (!--oip->ip_open_cnt)
+	if (!--oi->ip_open_count)
 		oi->ip_flags &= ~OCFS2_INODE_OPEN_DIRECT;
 	spin_unlock(&oip->ip_lock);
 

Modified: branches/alloc_inode/fs/ocfs2/inode.c
===================================================================
--- branches/alloc_inode/fs/ocfs2/inode.c	2005-05-14 06:00:10 UTC (rev 2245)
+++ branches/alloc_inode/fs/ocfs2/inode.c	2005-05-14 06:45:46 UTC (rev 2246)
@@ -215,7 +215,6 @@
 
 	i->ip_flags = 0;
 	atomic_set(&i->ip_clean_buffer_seq, 0);
-	i->ip_open_cnt = 0;
 	spin_lock_init(&i->ip_lock);
 	ocfs2_extent_map_init(inode);
 	INIT_LIST_HEAD(&i->ip_handle_list);
@@ -777,8 +776,13 @@
 
 	OCFS_I(inode)->ip_flags &= ~OCFS_INODE_INITIALIZED;
 
+	if (OCFS2_I(inode)->ip_open_count)
+		mlog(ML_ERROR,
+		     "Clear inode of %"MLFu64" has open count %d\n",
+		     OCFS2_I(inode)->ip_blkno,
+		     OCFS2_I(inode)->ip_open_count);
+	OCFS2_I(inode)->ip_flags = 0;
 	OCFS2_I(inode)->ip_blkno = 0ULL;
-	OCFS2_I(inode)->ip_flags = 0;
 
 	/* clean out the inode private ... why?! */
 	memset(inode->u.generic_ip, 0, sizeof(ocfs_inode_private));

Modified: branches/alloc_inode/fs/ocfs2/inode.h
===================================================================
--- branches/alloc_inode/fs/ocfs2/inode.h	2005-05-14 06:00:10 UTC (rev 2245)
+++ branches/alloc_inode/fs/ocfs2/inode.h	2005-05-14 06:45:46 UTC (rev 2246)
@@ -39,7 +39,7 @@
 
 	/* These fields are protected by ip_lock */
 	spinlock_t		ip_lock;
-	u32			ip_open_cnt;
+	u32			ip_open_count;
 	u32			ip_clusters;
 	loff_t			ip_mmu_private;
 	struct ocfs2_extent_map	ip_map;

Modified: branches/alloc_inode/fs/ocfs2/journal.c
===================================================================
--- branches/alloc_inode/fs/ocfs2/journal.c	2005-05-14 06:00:10 UTC (rev 2245)
+++ branches/alloc_inode/fs/ocfs2/journal.c	2005-05-14 06:45:46 UTC (rev 2246)
@@ -558,7 +558,7 @@
 			       "(%lld != %"MLFu64")",
 		     inode->i_size, fe->i_size);
 
-	OCFS_I(inode)->ip_open_cnt++;
+	OCFS2_I(inode)->ip_open_count++;
 
 	/* call the kernels journal init function now */
 	j_journal = journal_init_inode(inode);
@@ -588,7 +588,7 @@
 			brelse(bh);
 		}
 		if (inode) {
-			OCFS_I(inode)->ip_open_cnt--;
+			OCFS2_I(inode)->ip_open_count--;
 			iput(inode);
 		}
 	}
@@ -681,7 +681,7 @@
 	/* Shutdown the kernel journal system */
 	journal_destroy(journal->j_journal);
 
-	OCFS_I(inode)->ip_open_cnt--;
+	OCFS2_I(inode)->ip_open_count--;
 
 	/* unlock our journal */
 	ocfs2_meta_unlock(inode, 1);

Modified: branches/alloc_inode/fs/ocfs2/ocfs.h
===================================================================
--- branches/alloc_inode/fs/ocfs2/ocfs.h	2005-05-14 06:00:10 UTC (rev 2245)
+++ branches/alloc_inode/fs/ocfs2/ocfs.h	2005-05-14 06:45:46 UTC (rev 2246)
@@ -186,7 +186,6 @@
 
 	/* These fields are protected by ip_lock */
 	spinlock_t	  ip_lock;
-	u32             ip_open_cnt;
 	u32		ip_clusters;
 	loff_t		ip_mmu_private;
 	struct ocfs2_extent_map ip_map;

Modified: branches/alloc_inode/fs/ocfs2/super.c
===================================================================
--- branches/alloc_inode/fs/ocfs2/super.c	2005-05-14 06:00:10 UTC (rev 2245)
+++ branches/alloc_inode/fs/ocfs2/super.c	2005-05-14 06:45:46 UTC (rev 2246)
@@ -549,7 +549,7 @@
 	    SLAB_CTOR_CONSTRUCTOR) {
 		oi->ip_flags = 0;
 		atomic_set(&oi->ip_clean_buffer_seq, 0);
-		oi->ip_open_cnt = 0;
+		oi->ip_open_count = 0;
 		spin_lock_init(&oi->ip_lock);
 		ocfs2_extent_map_init(&oi->vfs_inode);
 		INIT_LIST_HEAD(&oi->ip_handle_list);

Modified: branches/alloc_inode/fs/ocfs2/vote.c
===================================================================
--- branches/alloc_inode/fs/ocfs2/vote.c	2005-05-14 06:00:10 UTC (rev 2245)
+++ branches/alloc_inode/fs/ocfs2/vote.c	2005-05-14 06:45:46 UTC (rev 2246)
@@ -196,8 +196,9 @@
 
 	spin_lock(&OCFS_I(inode)->ip_lock);
 	/* vote no if the file is still open. */
-	if (OCFS_I(inode)->ip_open_cnt > 0) {
-		mlog(0, "open count = %u\n", OCFS_I(inode)->ip_open_cnt);
+	if (OCFS2_I(inode)->ip_open_count > 0) {
+		mlog(0, "open count = %u\n",
+		     OCFS2_I(inode)->ip_open_count);
 		spin_unlock(&OCFS_I(inode)->ip_lock);
 		goto done;
 	}