Merge branch '3.1-rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/nab...

[mirror_ubuntu-bionic-kernel.git] / fs / btrfs / extent_map.h

diff --git a/fs/btrfs/extent_map.h b/fs/btrfs/extent_map.h
index 255813c51b9d0afb72d505d9b984cc13be0d5409..33a7890b1f4091479df52d7a13c1532ba911ce76 100644 (file)
--- a/fs/btrfs/extent_map.h
+++ b/fs/btrfs/extent_map.h
@@ -56,7 +56,7 @@ int add_extent_mapping(struct extent_map_tree *tree,
                       struct extent_map *em);
 int remove_extent_mapping(struct extent_map_tree *tree, struct extent_map *em);
 
-struct extent_map *alloc_extent_map(gfp_t mask);
+struct extent_map *alloc_extent_map(void);
 void free_extent_map(struct extent_map *em);
 int __init extent_map_init(void);
 void extent_map_exit(void);