summaryrefslogtreecommitdiff
path: root/fs/btrfs/ulist.h
diff options
context:
space:
mode:
authorChris Mason <chris.mason@oracle.com>2012-05-30 19:55:38 +0400
committerChris Mason <chris.mason@oracle.com>2012-05-30 19:55:38 +0400
commitcfc442b69696b593cb442f09997dcb4cb5748171 (patch)
tree84a28a271ad14a695507df65af4ac0c83e64217c /fs/btrfs/ulist.h
parent76e10d158efb6d4516018846f60c2ab5501900bc (diff)
parent48235a68a3d1db579fc20d9915815228a1825757 (diff)
downloadlinux-cfc442b69696b593cb442f09997dcb4cb5748171.tar.xz
Merge branch 'for-chris' of git://git.kernel.org/pub/scm/linux/kernel/git/josef/btrfs-next into HEAD
Diffstat (limited to 'fs/btrfs/ulist.h')
-rw-r--r--fs/btrfs/ulist.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/fs/btrfs/ulist.h b/fs/btrfs/ulist.h
index 2e25dec58ec0..6568c3527732 100644
--- a/fs/btrfs/ulist.h
+++ b/fs/btrfs/ulist.h
@@ -59,10 +59,9 @@ struct ulist {
void ulist_init(struct ulist *ulist);
void ulist_fini(struct ulist *ulist);
void ulist_reinit(struct ulist *ulist);
-struct ulist *ulist_alloc(unsigned long gfp_mask);
+struct ulist *ulist_alloc(gfp_t gfp_mask);
void ulist_free(struct ulist *ulist);
-int ulist_add(struct ulist *ulist, u64 val, unsigned long aux,
- unsigned long gfp_mask);
+int ulist_add(struct ulist *ulist, u64 val, unsigned long aux, gfp_t gfp_mask);
struct ulist_node *ulist_next(struct ulist *ulist, struct ulist_node *prev);
#endif