diff --git a/[refs] b/[refs] index 61197b5adfac..479771e6e513 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b4966b7770349deb05e3dd2bd2c65d2d044abbbb +refs/heads/master: 7e6b6465e6efbca3985258996be9c189da96c8bf diff --git a/trunk/fs/btrfs/inode.c b/trunk/fs/btrfs/inode.c index e7a8303328b2..db67821ccac2 100644 --- a/trunk/fs/btrfs/inode.c +++ b/trunk/fs/btrfs/inode.c @@ -4823,10 +4823,11 @@ static int btrfs_link(struct dentry *old_dentry, struct inode *dir, goto fail; /* - * 1 item for inode ref + * 2 items for inode and inode ref * 2 items for dir items + * 1 item for parent inode */ - trans = btrfs_start_transaction(root, 3); + trans = btrfs_start_transaction(root, 5); if (IS_ERR(trans)) { err = PTR_ERR(trans); goto fail;