diff options
| author | Chris Mason <chris.mason@oracle.com> | 2012-05-31 16:50:28 -0400 |
|---|---|---|
| committer | Chris Mason <chris.mason@oracle.com> | 2012-05-31 16:49:53 -0400 |
| commit | 1e20932a23578bb1ec59107843574e259b96193f (patch) | |
| tree | 844ae54293c4414fc4c232a36d0e4d4939dc35aa /fs/btrfs/backref.h | |
| parent | cfc442b69696b593cb442f09997dcb4cb5748171 (diff) | |
| parent | c31931088fd6cf953bd0868a2647b6c3928e6c96 (diff) | |
| download | blackbird-op-linux-1e20932a23578bb1ec59107843574e259b96193f.tar.gz blackbird-op-linux-1e20932a23578bb1ec59107843574e259b96193f.zip | |
Merge branch 'for-chris' of git://git.jan-o-sch.net/btrfs-unstable into for-linus
Conflicts:
fs/btrfs/ulist.h
Signed-off-by: Chris Mason <chris.mason@oracle.com>
Diffstat (limited to 'fs/btrfs/backref.h')
| -rw-r--r-- | fs/btrfs/backref.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/btrfs/backref.h b/fs/btrfs/backref.h index 57ea2e959e4d..c18d8ac7b795 100644 --- 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, |
