diff options
| author | Chris Mason <chris.mason@oracle.com> | 2012-03-28 20:33:40 -0400 |
|---|---|---|
| committer | Chris Mason <chris.mason@oracle.com> | 2012-03-28 20:33:40 -0400 |
| commit | 98961a7e431735c791dbaaf0337029e219a5db5a (patch) | |
| tree | e045f062c01075e1f88ab758717cbfd7a7ddd4ca /fs/btrfs/backref.h | |
| parent | 1c691b330a19a1344df89bcb0f4cacd99e8b289a (diff) | |
| parent | 7a3ae2f8c8c8432e65467b7fc84d5deab04061a0 (diff) | |
| download | linux-98961a7e431735c791dbaaf0337029e219a5db5a.tar.bz2 | |
Merge git://git.jan-o-sch.net/btrfs-unstable into for-linus
Conflicts:
fs/btrfs/transaction.c
Signed-off-by: Chris Mason <chris.mason@oracle.com>
Diffstat (limited to 'fs/btrfs/backref.h')
| -rw-r--r-- | fs/btrfs/backref.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/fs/btrfs/backref.h b/fs/btrfs/backref.h index d00dfa9ca934..57ea2e959e4d 100644 --- a/fs/btrfs/backref.h +++ b/fs/btrfs/backref.h @@ -22,6 +22,8 @@ #include "ioctl.h" #include "ulist.h" +#define BTRFS_BACKREF_SEARCH_COMMIT_ROOT ((struct btrfs_trans_handle *)0) + struct inode_fs_paths { struct btrfs_path *btrfs_path; struct btrfs_root *fs_root; @@ -44,9 +46,8 @@ int tree_backref_for_extent(unsigned long *ptr, struct extent_buffer *eb, u64 *out_root, u8 *out_level); int iterate_extent_inodes(struct btrfs_fs_info *fs_info, - struct btrfs_path *path, u64 extent_item_objectid, - u64 extent_offset, + u64 extent_offset, int search_commit_root, iterate_extent_inodes_t *iterate, void *ctx); int iterate_inodes_from_logical(u64 logical, struct btrfs_fs_info *fs_info, |