---

yaml --- r: 143703 b: refs/heads/master c: fc6f394 h: refs/heads/master i: 143701: e6b01fe 143699: c50ece9 143695: 6c3d97a v: v3
git-mirror · Apr 17, 2009 · 145bfe1 · 145bfe1
1 parent 597e263
commit 145bfe1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 22c9d52bc03b880045ab1081890a38f11b272ae7
+refs/heads/master: fc6f394332ef1bf6ff5fbeaba0f2cd7a3c7971b6
diff --git a/trunk/fs/cifs/inode.c b/trunk/fs/cifs/inode.c
@@ -1453,7 +1453,8 @@ int cifs_rename(struct inode *source_dir, struct dentry *source_dentry,
 		     checking the UniqueId via FILE_INTERNAL_INFO */
 
 unlink_target:
-	if ((rc == -EACCES) || (rc == -EEXIST)) {
+	/* Try unlinking the target dentry if it's not negative */
+	if (target_dentry->d_inode && (rc == -EACCES || rc == -EEXIST)) {
 		tmprc = cifs_unlink(target_dir, target_dentry);
 		if (tmprc)
 			goto cifs_rename_exit;