Commit da432a625434d5f0ebce5d703dafe3bd0c8e8bd4
Committed by
Greg Kroah-Hartman
1 parent
db8bf54b17
Exists in
ti-linux-3.14.y
and in
2 other branches
CIFS: Fix directory rename error
commit a07d322059db66b84c9eb4f98959df468e88b34b upstream. CIFS servers process nlink counts differently for files and directories. In cifs_rename() if we the request fails on the existing target, we try to remove it through cifs_unlink() but this is not what we want to do for directories. As the result the following sequence of commands mkdir {1,2}; mv -T 1 2; rmdir {1,2}; mkdir {1,2}; echo foo > 2/bar and XFS test generic/023 fail with -ENOENT error. That's why the second mkdir reuses the existing inode (target inode of the mv -T command) with S_DEAD flag. Fix this by checking whether the target is directory or not and calling cifs_rmdir() rather than cifs_unlink() for directories. Signed-off-by: Pavel Shilovsky <pshilovsky@samba.org> Signed-off-by: Steve French <smfrench@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Showing 1 changed file with 4 additions and 1 deletions Side-by-side Diff
fs/cifs/inode.c
... | ... | @@ -1706,7 +1706,10 @@ |
1706 | 1706 | unlink_target: |
1707 | 1707 | /* Try unlinking the target dentry if it's not negative */ |
1708 | 1708 | if (target_dentry->d_inode && (rc == -EACCES || rc == -EEXIST)) { |
1709 | - tmprc = cifs_unlink(target_dir, target_dentry); | |
1709 | + if (d_is_dir(target_dentry)) | |
1710 | + tmprc = cifs_rmdir(target_dir, target_dentry); | |
1711 | + else | |
1712 | + tmprc = cifs_unlink(target_dir, target_dentry); | |
1710 | 1713 | if (tmprc) |
1711 | 1714 | goto cifs_rename_exit; |
1712 | 1715 | rc = cifs_do_rename(xid, source_dentry, from_name, |