From 72815987b967651a12730ee7a77952fb19b810be Mon Sep 17 00:00:00 2001
From: Miao Xie <miaox@cn.fujitsu.com>
Date: Thu, 28 Mar 2013 08:08:20 +0000
Subject: [PATCH] --- yaml --- r: 361959 b: refs/heads/master c:
 39847c4d3d91f487f9ab3d083ee5d0f8419f105c h: refs/heads/master i:   361957:
 e8126be290dc7060b77d18579d34dcd48077b358   361955:
 829fe1c89a7ff33bf9182c8ec3c1de00b510d4b5   361951:
 2abce6c53abc7ac6e31b813e0664cec9edfb9274 v: v3

---
 [refs]                     | 2 +-
 trunk/fs/btrfs/file-item.c | 2 --
 trunk/fs/btrfs/inode.c     | 2 ++
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index bcc9190a110e..fbab810088f5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a7975026ff9ddf91ba190ae2b71699dd156395e3
+refs/heads/master: 39847c4d3d91f487f9ab3d083ee5d0f8419f105c
diff --git a/trunk/fs/btrfs/file-item.c b/trunk/fs/btrfs/file-item.c
index ec160202be3e..b7e529d2860f 100644
--- a/trunk/fs/btrfs/file-item.c
+++ b/trunk/fs/btrfs/file-item.c
@@ -728,7 +728,6 @@ int btrfs_csum_file_blocks(struct btrfs_trans_handle *trans,
 		return -ENOMEM;
 
 	sector_sum = sums->sums;
-	trans->adding_csums = 1;
 again:
 	next_offset = (u64)-1;
 	found_next = 0;
@@ -899,7 +898,6 @@ int btrfs_csum_file_blocks(struct btrfs_trans_handle *trans,
 		goto again;
 	}
 out:
-	trans->adding_csums = 0;
 	btrfs_free_path(path);
 	return ret;
 
diff --git a/trunk/fs/btrfs/inode.c b/trunk/fs/btrfs/inode.c
index 8cab424c75f8..b88381582dab 100644
--- a/trunk/fs/btrfs/inode.c
+++ b/trunk/fs/btrfs/inode.c
@@ -1757,8 +1757,10 @@ static noinline int add_pending_csums(struct btrfs_trans_handle *trans,
 	struct btrfs_ordered_sum *sum;
 
 	list_for_each_entry(sum, list, list) {
+		trans->adding_csums = 1;
 		btrfs_csum_file_blocks(trans,
 		       BTRFS_I(inode)->root->fs_info->csum_root, sum);
+		trans->adding_csums = 0;
 	}
 	return 0;
 }