[Ocfs2-commits] mfasheh commits r858 - trunk/src

[svn-commits at oss.oracle.com]

Author: mfasheh
Date: 2004-04-20 12:52:32 -0500 (Tue, 20 Apr 2004)
New Revision: 858

Modified:
   trunk/src/namei.c
Log:
* don't create a lockres on the inode in mknod anymore. This was causing a lockres leak.
* update a couple printks


Modified: trunk/src/namei.c
===================================================================
--- trunk/src/namei.c	2004-04-20 00:43:16 UTC (rev 857)
+++ trunk/src/namei.c	2004-04-20 17:52:32 UTC (rev 858)
@@ -248,11 +248,6 @@
 	OCFS_BH_PUT_DATA(new_fe_bh);
 	fe = NULL;
 
-	status = ocfs_create_update_lock(osb, GET_INODE_VOTEOFF(inode), 
-					 oinflags, true, inode, handle);
-	if (status < 0)
-		LOG_ERROR_STATUS(status);
-
 	fe = (ocfs_file_entry *) OCFS_BH_GET_DATA_READ(new_fe_bh); /* read */
 
         /*  Insert the OFile on the OIN list */
@@ -275,10 +270,10 @@
 	OCFS_BH_PUT_DATA(new_fe_bh);
 	fe = NULL;
 
-	LOG_TRACE_ARGS("ocfs2: Created inode %u (voteoff: %u.%u, "
-		       "feoff: %u.%u)\n", inode->i_ino, 
+	LOG_TRACE_ARGS("Created inode %u (voteoff: %u.%u, "
+		       "feoff: %u.%u), lockres = %p\n", inode->i_ino, 
 		       HILO(GET_INODE_VOTEOFF(inode)), 
-		       HILO(GET_INODE_FEOFF(inode)));
+		       HILO(GET_INODE_FEOFF(inode)), OCFS_I(inode)->lock_res);
 
 	d_instantiate (dentry, inode);
 	ocfs_commit_trans(handle);
@@ -1308,7 +1303,6 @@
 	l = strlen (symname) + 1;
 	newsize = l - 1;
 
-
 	osb = (ocfs_super *) OCFS_GENERIC_SB_P(dir->i_sb);
 
 	/* need the offset of our parent directory to lock it */
@@ -1792,11 +1786,11 @@
 
 	if (inode && status == 0 && !(flags & FLAG_DEL_INODE)) {
 		SET_INODE_DELETED(inode);
-//		printk("ocfs2: removing inode (%p, %p) %lu, voteoff = %u.%u, "
-//		       "feoff = %u.%u\n", inode, inode->u.generic_ip,
-//		       inode->i_ino, 
-//			       HILO(GET_INODE_VOTEOFF(inode)), 
-//			       HILO(GET_INODE_FEOFF(inode)));
+//		printk("ocfs2: removing inode %lu, voteoff = %u.%u, "
+//		       "feoff = %u.%u, count = %u\n", inode->i_ino, 
+//		       HILO(GET_INODE_VOTEOFF(inode)), 
+//		       HILO(GET_INODE_FEOFF(inode)), 
+//		       atomic_read(&inode->i_count));
 		ocfs_inode_hash_remove(&osb->inode_hash, 
 				       GET_INODE_VOTEOFF(inode));
 	}