diff --git a/[refs] b/[refs] index e0cf3d74db85..a72c68e86987 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3de3f774f98490dbac63b7b50a0d2eedfea86b5a +refs/heads/master: 93a6925ec10c2d5792ffad35af8366179c9db57c diff --git a/trunk/fs/btrfs/inode.c b/trunk/fs/btrfs/inode.c index 39c1fe178f47..cde8ddde6098 100644 --- a/trunk/fs/btrfs/inode.c +++ b/trunk/fs/btrfs/inode.c @@ -2214,13 +2214,6 @@ static int btrfs_rename(struct inode * old_dir, struct dentry *old_dentry, ret = btrfs_unlink_trans(trans, root, new_dir, new_dentry); if (ret) goto out_fail; - if (S_ISDIR(new_inode->i_mode)) - clear_nlink(new_inode); - else - drop_nlink(new_inode); - ret = btrfs_update_inode(trans, root, new_inode); - if (ret) - goto out_fail; } ret = btrfs_add_link(trans, new_dentry, old_inode); if (ret)