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

[linux-2.6-block.git] / fs / btrfs / ulist.c

diff --git a/fs/btrfs/ulist.c b/fs/btrfs/ulist.c
index 2ef59400ad6eb38bef17d3967f33fb46dd4287ac..ab942f46b3dd81e06348c4950901f3e4eef87016 100644 (file)
--- a/fs/btrfs/ulist.c
+++ b/fs/btrfs/ulist.c
@@ -95,7 +95,7 @@ EXPORT_SYMBOL(ulist_reinit);
  *
  * The allocated ulist will be returned in an initialized state.
  */
-struct ulist *ulist_alloc(unsigned long gfp_mask)
+struct ulist *ulist_alloc(gfp_t gfp_mask)
 {
        struct ulist *ulist = kmalloc(sizeof(*ulist), gfp_mask);
 
@@ -144,13 +144,13 @@ EXPORT_SYMBOL(ulist_free);
  * unaltered.
  */
 int ulist_add(struct ulist *ulist, u64 val, unsigned long aux,
-             unsigned long gfp_mask)
+             gfp_t gfp_mask)
 {
        return ulist_add_merge(ulist, val, aux, NULL, gfp_mask);
 }
 
 int ulist_add_merge(struct ulist *ulist, u64 val, unsigned long aux,
-                   unsigned long *old_aux, unsigned long gfp_mask)
+                   unsigned long *old_aux, gfp_t gfp_mask)
 {
        int i;