From cd630e9a8c55423f911bab62954d49f84e0f9b19 Mon Sep 17 00:00:00 2001 From: Josef Bacik Date: Wed, 5 Sep 2012 08:08:30 -0600 Subject: [PATCH] --- yaml --- r: 332559 b: refs/heads/master c: 6df7881a84013f91405e5e113a4c322dd1804ba6 h: refs/heads/master i: 332557: 62afb8af5c67bf212cdcf9fce90dbda4bad044e5 332555: 8a149ac897717c225b3cfb41798c5dce5a818d80 332551: 1542b3524bc87801569c97c59101fc6af6afe723 332543: b713f647912c12be11d881f46b2ea47b149cd17a v: v3 --- [refs] | 2 +- trunk/fs/btrfs/transaction.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 31015c908c56..c7626907985b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 425d17a290c0c63785ec65db154a95c6337aeefa +refs/heads/master: 6df7881a84013f91405e5e113a4c322dd1804ba6 diff --git a/trunk/fs/btrfs/transaction.c b/trunk/fs/btrfs/transaction.c index f8ae448ebec4..0629edf99100 100644 --- a/trunk/fs/btrfs/transaction.c +++ b/trunk/fs/btrfs/transaction.c @@ -564,8 +564,6 @@ static int __btrfs_end_transaction(struct btrfs_trans_handle *trans, btrfs_trans_release_metadata(trans, root); trans->block_rsv = NULL; - sb_end_intwrite(root->fs_info->sb); - if (lock && !atomic_read(&root->fs_info->open_ioctl_trans) && should_end_transaction(trans, root)) { trans->transaction->blocked = 1; @@ -586,6 +584,8 @@ static int __btrfs_end_transaction(struct btrfs_trans_handle *trans, } } + sb_end_intwrite(root->fs_info->sb); + WARN_ON(cur_trans != info->running_transaction); WARN_ON(atomic_read(&cur_trans->num_writers) < 1); atomic_dec(&cur_trans->num_writers);