lkml.org 
[lkml]   [2020]   [Jul]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.9 31/61] Revert "cifs: Fix the target file was deleted when rename failed."
    Date
    From: Steve French <stfrench@microsoft.com>

    commit 0e6705182d4e1b77248a93470d6d7b3013d59b30 upstream.

    This reverts commit 9ffad9263b467efd8f8dc7ae1941a0a655a2bab2.

    Upon additional testing with older servers, it was found that
    the original commit introduced a regression when using the old SMB1
    dialect and rsyncing over an existing file.

    The patch will need to be respun to address this, likely including
    a larger refactoring of the SMB1 and SMB3 rename code paths to make
    it less confusing and also to address some additional rename error
    cases that SMB3 may be able to workaround.

    Signed-off-by: Steve French <stfrench@microsoft.com>
    Reported-by: Patrick Fernie <patrick.fernie@gmail.com>
    CC: Stable <stable@vger.kernel.org>
    Acked-by: Ronnie Sahlberg <lsahlber@redhat.com>
    Acked-by: Pavel Shilovsky <pshilov@microsoft.com>
    Acked-by: Zhang Xiaoxu <zhangxiaoxu5@huawei.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    fs/cifs/inode.c | 10 ++--------
    1 file changed, 2 insertions(+), 8 deletions(-)

    --- a/fs/cifs/inode.c
    +++ b/fs/cifs/inode.c
    @@ -1770,7 +1770,6 @@ cifs_rename2(struct inode *source_dir, s
    FILE_UNIX_BASIC_INFO *info_buf_target;
    unsigned int xid;
    int rc, tmprc;
    - bool new_target = d_really_is_negative(target_dentry);

    if (flags & ~RENAME_NOREPLACE)
    return -EINVAL;
    @@ -1847,13 +1846,8 @@ cifs_rename2(struct inode *source_dir, s
    */

    unlink_target:
    - /*
    - * If the target dentry was created during the rename, try
    - * unlinking it if it's not negative
    - */
    - if (new_target &&
    - d_really_is_positive(target_dentry) &&
    - (rc == -EACCES || rc == -EEXIST)) {
    + /* Try unlinking the target dentry if it's not negative */
    + if (d_really_is_positive(target_dentry) && (rc == -EACCES || rc == -EEXIST)) {
    if (d_is_dir(target_dentry))
    tmprc = cifs_rmdir(target_dir, target_dentry);
    else

    \
     
     \ /
      Last update: 2020-07-30 10:18    [W:2.829 / U:0.020 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site