[Ocfs2-commits] smushran commits r3093 - branches/ocfs2-1.2/fs/ocfs2

[svn-commits at oss.oracle.com]

Author: smushran
Date: 2008-05-02 14:26:58 -0700 (Fri, 02 May 2008)
New Revision: 3093

Modified:
   branches/ocfs2-1.2/fs/ocfs2/namei.c
Log:
ocfs2: Improve rename locking

Mainline commit 5dabd69515765156605b09261abf969236a77803
Author: Jan Kara <jack at suse.cz>
Date: Thu, 21 Feb 2008 18:00:00 +0100

ocfs2_rename() was being too aggressive with the rename lock - we only need
it for certain forms of directory rename.

Signed-off-by: jlbec

Modified: branches/ocfs2-1.2/fs/ocfs2/namei.c
===================================================================
--- branches/ocfs2-1.2/fs/ocfs2/namei.c	2008-05-02 21:25:57 UTC (rev 3092)
+++ branches/ocfs2-1.2/fs/ocfs2/namei.c	2008-05-02 21:26:58 UTC (rev 3093)
@@ -1053,7 +1053,7 @@
 	 *
 	 * And that's why, just like the VFS, we need a file system
 	 * rename lock. */
-	if (old_dentry != new_dentry) {
+	if (old_dir != new_dir && S_ISDIR(old_inode->i_mode)) {
 		status = ocfs2_rename_lock(osb);
 		if (status < 0) {
 			mlog_errno(status);