Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg...

[karo-tx-linux.git] / fs / btrfs / transaction.c

diff --git a/fs/btrfs/transaction.c b/fs/btrfs/transaction.c
index 56ab1f5ea11bb0cb2917de61fc238548b81d94e6..8a08f94433407e6c8ca7ce2e15285ef75115bb26 100644 (file)
--- a/fs/btrfs/transaction.c
+++ b/fs/btrfs/transaction.c
@@ -800,7 +800,7 @@ static noinline int finish_pending_snapshot(struct btrfs_fs_info *fs_info,
 
        parent_inode = pending->dentry->d_parent->d_inode;
        parent_root = BTRFS_I(parent_inode)->root;
-       trans = btrfs_start_transaction(parent_root, 1);
+       trans = btrfs_join_transaction(parent_root, 1);
 
        /*
         * insert the directory item