diff options
| author | Chris Mason <chris.mason@oracle.com> | 2012-05-30 11:55:38 -0400 |
|---|---|---|
| committer | Chris Mason <chris.mason@oracle.com> | 2012-05-30 11:55:38 -0400 |
| commit | cfc442b69696b593cb442f09997dcb4cb5748171 (patch) | |
| tree | 84a28a271ad14a695507df65af4ac0c83e64217c /fs/btrfs/ulist.c | |
| parent | 76e10d158efb6d4516018846f60c2ab5501900bc (diff) | |
| parent | 48235a68a3d1db579fc20d9915815228a1825757 (diff) | |
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.c')
| -rw-r--r-- | fs/btrfs/ulist.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/btrfs/ulist.c b/fs/btrfs/ulist.c index 12f5147bd2b1..ad993bc2df93 100644 --- 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,7 +144,7 @@ EXPORT_SYMBOL(ulist_free); * unaltered. */ int ulist_add(struct ulist *ulist, u64 val, unsigned long aux, - unsigned long gfp_mask) + gfp_t gfp_mask) { int i; |