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

[svn-commits at oss.oracle.com]

Author: mfasheh
Date: 2004-06-16 15:56:57 -0500 (Wed, 16 Jun 2004)
New Revision: 1112

Modified:
   trunk/src/namei.c
Log:
* fix a deadlock in symlink. We're still broken somewhere in symlink
  though...



Modified: trunk/src/namei.c
===================================================================
--- trunk/src/namei.c	2004-06-16 19:14:16 UTC (rev 1111)
+++ trunk/src/namei.c	2004-06-16 20:56:57 UTC (rev 1112)
@@ -1276,7 +1276,6 @@
 		inode = NULL;
 		goto bail;
 	}
-	down_write(&OCFS_I(inode)->ip_io_sem);
 
 	l = strlen (symname) + 1;
 	newsize = l - 1;
@@ -1344,9 +1343,6 @@
 		goto abort_trans;
 	}
 
-	insert_inode_hash (inode);
-	d_instantiate (dentry, inode);
-
 abort_trans:
 	if (status < 0) {
 		ocfs_abort_trans(handle);
@@ -1367,10 +1363,13 @@
 	}
 
 bail:
-	if (inode)
-		up_write(&OCFS_I(inode)->ip_io_sem);
 	up_write(&OCFS_I(dir)->ip_io_sem);
 
+	if (status >= 0) {
+		insert_inode_hash (inode);
+		d_instantiate (dentry, inode);
+	}
+
 	if (new_fe_bh) {
 		if (fe)
 			OCFS_BH_PUT_DATA(new_fe_bh);