Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag '5.8-rc6-cifs-fix' of git://git.samba.org/sfrench/cifs-2.6 into master
Pull cifs fix from Steve French:
"A fix for a recently discovered regression in rename to older servers
caused by a recent patch"
* tag '5.8-rc6-cifs-fix' of git://git.samba.org/sfrench/cifs-2.6:
Revert "cifs: Fix the target file was deleted when rename failed."
+2
-8
+2
-8
fs/cifs/inode.c
+2
-8
fs/cifs/inode.c
···
2044
2044
FILE_UNIX_BASIC_INFO *info_buf_target;
2045
2045
unsigned int xid;
2046
2046
int rc, tmprc;
2047
-
bool new_target = d_really_is_negative(target_dentry);
2048
2047
2049
2048
if (flags & ~RENAME_NOREPLACE)
2050
2049
return -EINVAL;
···
2120
2121
*/
2121
2122
2122
2123
unlink_target:
2123
-
/*
2124
-
* If the target dentry was created during the rename, try
2125
-
* unlinking it if it's not negative
2126
-
*/
2127
-
if (new_target &&
2128
-
d_really_is_positive(target_dentry) &&
2129
-
(rc == -EACCES || rc == -EEXIST)) {
2124
+
/* Try unlinking the target dentry if it's not negative */
2125
+
if (d_really_is_positive(target_dentry) && (rc == -EACCES || rc == -EEXIST)) {
2130
2126
if (d_is_dir(target_dentry))
2131
2127
tmprc = cifs_rmdir(target_dir, target_dentry);
2132
2128
else