---

yaml --- r: 332559 b: refs/heads/master c: 6df7881 h: refs/heads/master i: 332557: 62afb8a 332555: 8a149ac 332551: 1542b35 332543: b713f64 v: v3
git-mirror · Oct 1, 2012 · cd630e9 · cd630e9
1 parent 24d9dd6
commit cd630e9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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);