From 374696cb07f8455a504628dfc92005b515a4dbf1 Mon Sep 17 00:00:00 2001 From: Chris Mason Date: Mon, 9 Jun 2008 09:35:50 -0400 Subject: [PATCH] --- yaml --- r: 128785 b: refs/heads/master c: 48ec2cf8738b0db53dc8361026cb7a328f7ad386 h: refs/heads/master i: 128783: 04727b1a65cdfceae41c01c3d0f05b53f0f99151 v: v3 --- [refs] | 2 +- trunk/fs/btrfs/transaction.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index d583e7261fe7..5635c139109a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e1b81e6761bd8419146d4bbe0aadd8b2d348a01c +refs/heads/master: 48ec2cf8738b0db53dc8361026cb7a328f7ad386 diff --git a/trunk/fs/btrfs/transaction.c b/trunk/fs/btrfs/transaction.c index 57746c11eae3..1cb084efd6ed 100644 --- a/trunk/fs/btrfs/transaction.c +++ b/trunk/fs/btrfs/transaction.c @@ -56,7 +56,6 @@ static noinline int join_transaction(struct btrfs_root *root) total_trans++; BUG_ON(!cur_trans); root->fs_info->generation++; - root->fs_info->running_transaction = cur_trans; root->fs_info->last_alloc = 0; root->fs_info->last_data_alloc = 0; cur_trans->num_writers = 1; @@ -74,6 +73,9 @@ static noinline int join_transaction(struct btrfs_root *root) extent_io_tree_init(&cur_trans->dirty_pages, root->fs_info->btree_inode->i_mapping, GFP_NOFS); + spin_lock(&root->fs_info->new_trans_lock); + root->fs_info->running_transaction = cur_trans; + spin_unlock(&root->fs_info->new_trans_lock); } else { cur_trans->num_writers++; cur_trans->num_joined++;