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

…to for-linus Conflicts: fs/btrfs/ulist.h Signed-off-by: Chris Mason <chris.mason@oracle.com>
mariux64 · May 31, 2012 · 1e20932 · 1e20932
2 parents cfc442b + c319310
commit 1e20932
Show file tree

Hide file tree

Showing 14 changed files with 1,368 additions and 252 deletions.
diff --git a/fs/btrfs/backref.c b/fs/btrfs/backref.c
diff --git a/fs/btrfs/backref.h b/fs/btrfs/backref.h
@@ -58,7 +58,8 @@ int paths_from_inode(u64 inum, struct inode_fs_paths *ipath);
 
 int btrfs_find_all_roots(struct btrfs_trans_handle *trans,
 				struct btrfs_fs_info *fs_info, u64 bytenr,
-				u64 num_bytes, u64 seq, struct ulist **roots);
+				u64 delayed_ref_seq, u64 time_seq,
+				struct ulist **roots);
 
 struct btrfs_data_container *init_data_container(u32 total_bytes);
 struct inode_fs_paths *init_ipath(s32 total_bytes, struct btrfs_root *fs_root,