---

yaml --- r: 252322 b: refs/heads/master c: 8e531cd h: refs/heads/master v: v3
git-mirror · May 23, 2011 · 5be2c89 · 5be2c89
1 parent ed1ed3c
commit 5be2c89
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git 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
@@ -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) {