Merge branch 'for-chris' of git://git.jan-o-sch.net/btrfs-unstable into integration

2012-01-16 15:26:31 -05:00
parent d756bd2d93 6bf7e080d5
commit 9785dbdf26
21 changed files with 1639 additions and 419 deletions
--- a/fs/btrfs/tree-log.c
+++ b/fs/btrfs/tree-log.c
@@ -589,7 +589,7 @@ static noinline int replay_one_extent(struct btrfs_trans_handle *trans,
 				ret = btrfs_inc_extent_ref(trans, root,
 						ins.objectid, ins.offset,
 						0, root->root_key.objectid,
-						key->objectid, offset);
+						key->objectid, offset, 0);
 				BUG_ON(ret);
 			} else {
 				/*