On 09/17/2014, 10:54 PM, Jiri Slaby wrote:
> From: Pavel Shilovsky <[email protected]>
>
> This patch does NOT apply to the 3.12 stable tree. If you still want
> it applied, please provide a backport.
Oh, and I have just taken the 3.10 backport to 3.12.
Thanks.
> ===============
>
> 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.
>
> Cc: <[email protected]>
> Signed-off-by: Pavel Shilovsky <[email protected]>
> Signed-off-by: Steve French <[email protected]>
> ---
> fs/cifs/inode.c | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/fs/cifs/inode.c b/fs/cifs/inode.c
> index 949ec909ec9a..7899a40465b3 100644
> --- a/fs/cifs/inode.c
> +++ b/fs/cifs/inode.c
> @@ -1720,7 +1720,10 @@ cifs_rename2(struct inode *source_dir, struct dentry
> *source_dentry,
> 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,
>
--
js
suse labs
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
