lkml.org 
[lkml]   [2013]   [Oct]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.8 16/81] Btrfs: use right root when checking for hash collision
    Date
    3.8.13.12 -stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Josef Bacik <jbacik@fusionio.com>

    commit 4871c1588f92c6c13f4713a7009f25f217055807 upstream.

    btrfs_rename was using the root of the old dir instead of the root of the new
    dir when checking for a hash collision, so if you tried to move a file into a
    subvol it would freak out because it would see the file you are trying to move
    in its current root. This fixes the bug where this would fail

    btrfs subvol create test1
    btrfs subvol create test2
    mv test1 test2.

    Thanks to Chris Murphy for catching this,

    Reported-by: Chris Murphy <lists@colorremedies.com>
    Signed-off-by: Josef Bacik <jbacik@fusionio.com>
    Signed-off-by: Chris Mason <chris.mason@fusionio.com>
    Signed-off-by: Kamal Mostafa <kamal@canonical.com>
    ---
    fs/btrfs/inode.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
    index 4b5398c..60e1296 100644
    --- a/fs/btrfs/inode.c
    +++ b/fs/btrfs/inode.c
    @@ -7387,7 +7387,7 @@ static int btrfs_rename(struct inode *old_dir, struct dentry *old_dentry,


    /* check for collisions, even if the name isn't there */
    - ret = btrfs_check_dir_item_collision(root, new_dir->i_ino,
    + ret = btrfs_check_dir_item_collision(dest, new_dir->i_ino,
    new_dentry->d_name.name,
    new_dentry->d_name.len);

    --
    1.8.1.2


    \
     
     \ /
      Last update: 2013-10-29 20:01    [W:4.150 / U:0.080 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site