From 5be2c893d4668a39a116f129275402b89144175b Mon Sep 17 00:00:00 2001
From: liubo <liubo2009@cn.fujitsu.com>
Date: Fri, 6 May 2011 10:36:09 +0800
Subject: [PATCH] --- yaml --- r: 252322 b: refs/heads/master c:
 8e531cdfeb75269c6c5aae33651cca39707848da h: refs/heads/master v: v3

---
 [refs]                    | 2 +-
 trunk/fs/btrfs/tree-log.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index e9b1c6b67029..a3f047e50693 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 712673339a0d085358fd1cd3a6477cc7979bb69f
+refs/heads/master: 8e531cdfeb75269c6c5aae33651cca39707848da
diff --git a/trunk/fs/btrfs/tree-log.c b/trunk/fs/btrfs/tree-log.c
index b4c191d6c774..0f5537e60bb4 100644
--- a/trunk/fs/btrfs/tree-log.c
+++ b/trunk/fs/btrfs/tree-log.c
@@ -2667,6 +2667,9 @@ static noinline int copy_items(struct btrfs_trans_handle *trans,
 			extent = btrfs_item_ptr(src, start_slot + i,
 						struct btrfs_file_extent_item);
 
+			if (btrfs_file_extent_generation(src, extent) < trans->transid)
+				continue;
+
 			found_type = btrfs_file_extent_type(src, extent);
 			if (found_type == BTRFS_FILE_EXTENT_REG ||
 			    found_type == BTRFS_FILE_EXTENT_PREALLOC) {