diff options
| author | Chris Mason <chris.mason@fusionio.com> | 2013-02-05 10:04:03 -0500 |
|---|---|---|
| committer | Chris Mason <chris.mason@fusionio.com> | 2013-02-05 10:04:03 -0500 |
| commit | 0e4e02636611dbf89a2f36320a32054f9936d6cb (patch) | |
| tree | 18b4ecc6c3812770b29729d7abbdc673ffd73a41 /fs/btrfs/extent_map.h | |
| parent | 1f0905ec156eec8f12cd593bc564551770319720 (diff) | |
| parent | 1eafa6c73791e4f312324ddad9cbcaf6a1b6052b (diff) | |
| download | olio-linux-3.10-0e4e02636611dbf89a2f36320a32054f9936d6cb.tar.xz olio-linux-3.10-0e4e02636611dbf89a2f36320a32054f9936d6cb.zip | |
Merge branch 'for-linus' into raid56-experimental
Conflicts:
fs/btrfs/volumes.c
Signed-off-by: Chris Mason <chris.mason@fusionio.com>
Diffstat (limited to 'fs/btrfs/extent_map.h')
| -rw-r--r-- | fs/btrfs/extent_map.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/btrfs/extent_map.h b/fs/btrfs/extent_map.h index 922943ce29e..c6598c89cff 100644 --- a/fs/btrfs/extent_map.h +++ b/fs/btrfs/extent_map.h @@ -69,6 +69,7 @@ void free_extent_map(struct extent_map *em); int __init extent_map_init(void); void extent_map_exit(void); int unpin_extent_cache(struct extent_map_tree *tree, u64 start, u64 len, u64 gen); +void clear_em_logging(struct extent_map_tree *tree, struct extent_map *em); struct extent_map *search_extent_mapping(struct extent_map_tree *tree, u64 start, u64 len); #endif |