This is a note to let you know that I've just added the patch titled
CIFS: Fix directory rename error
to the 3.14-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
cifs-fix-directory-rename-error.patch
and it can be found in the queue-3.14 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From a07d322059db66b84c9eb4f98959df468e88b34b Mon Sep 17 00:00:00 2001
From: Pavel Shilovsky <pshilovsky@xxxxxxxxx>
Date: Fri, 22 Aug 2014 13:32:09 +0400
Subject: CIFS: Fix directory rename error
From: Pavel Shilovsky <pshilovsky@xxxxxxxxx>
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@xxxxxxxxx>
Signed-off-by: Steve French <smfrench@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
fs/cifs/inode.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
--- a/fs/cifs/inode.c
+++ b/fs/cifs/inode.c
@@ -1706,7 +1706,10 @@ cifs_rename(struct inode *source_dir, st
unlink_target:
/* 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 (d_is_dir(target_dentry))
+ tmprc = cifs_rmdir(target_dir, target_dentry);
+ else
+ tmprc = cifs_unlink(target_dir, target_dentry);
if (tmprc)
goto cifs_rename_exit;
rc = cifs_do_rename(xid, source_dentry, from_name,
Patches currently in stable-queue which might be from pshilovsky@xxxxxxxxx are
queue-3.14/cifs-fix-wrong-restart-readdir-for-smb1.patch
queue-3.14/cifs-fix-directory-rename-error.patch
queue-3.14/cifs-fix-async-reading-on-reconnects.patch
queue-3.14/cifs-fix-wrong-directory-attributes-after-rename.patch
queue-3.14/cifs-fix-wrong-filename-length-for-smb2.patch
queue-3.14/cifs-fix-status_cannot_delete-error-mapping-for-smb2.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html