---

yaml --- r: 89596 b: refs/heads/master c: 5dabd69 h: refs/heads/master v: v3
git-mirror · Apr 18, 2008 · d22ee72 · d22ee72
1 parent 88b43af
commit d22ee72
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 58dadcdbc2584db050969f9781727fc5a3f618db
+refs/heads/master: 5dabd69515765156605b09261abf969236a77803
diff --git a/trunk/fs/ocfs2/namei.c b/trunk/fs/ocfs2/namei.c
@@ -997,7 +997,7 @@ static int ocfs2_rename(struct inode *old_dir,
 	 *
 	 * 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);