diff --git a/[refs] b/[refs]
index cee982175e7b..5f77be8f97b6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 61de800d33af585cb7e6f27b5cdd51029c6855cb
+refs/heads/master: ae6884a9da56f8921e432e663b4ccb4a1851b2ea
diff --git a/trunk/fs/cifs/inode.c b/trunk/fs/cifs/inode.c
index d54fa8aeaea9..ff8c68de4a92 100644
--- a/trunk/fs/cifs/inode.c
+++ b/trunk/fs/cifs/inode.c
@@ -1361,9 +1361,11 @@ int cifs_rename(struct inode *source_dir, struct dentry *source_dentry,
 					CIFS_MOUNT_MAP_SPECIAL_CHR);
 
 		if (tmprc == 0 && (info_buf_source->UniqueId ==
-				   info_buf_target->UniqueId))
+				   info_buf_target->UniqueId)) {
 			/* same file, POSIX says that this is a noop */
+			rc = 0;
 			goto cifs_rename_exit;
+		}
 	} /* else ... BB we could add the same check for Windows by
 		     checking the UniqueId via FILE_INTERNAL_INFO */