projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux...
[firefly-linux-kernel-4.4.55.git]
/
fs
/
btrfs
/
ulist.h
diff --git
a/fs/btrfs/ulist.h
b/fs/btrfs/ulist.h
index 62d2574f775a29ff6d413d59c05f7bf46c31cf7f..21bdc8ec813046ac56e3c7db0739bcdba7ac188a 100644
(file)
--- a/
fs/btrfs/ulist.h
+++ b/
fs/btrfs/ulist.h
@@
-63,10
+63,12
@@
struct ulist {
void ulist_init(struct ulist *ulist);
void ulist_fini(struct ulist *ulist);
void ulist_reinit(struct ulist *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,
void ulist_free(struct ulist *ulist);
int ulist_add(struct ulist *ulist, u64 val, unsigned long aux,
- unsigned long gfp_mask);
+ gfp_t gfp_mask);
+int ulist_add_merge(struct ulist *ulist, u64 val, unsigned long aux,
+ unsigned long *old_aux, gfp_t gfp_mask);
struct ulist_node *ulist_next(struct ulist *ulist,
struct ulist_iterator *uiter);
struct ulist_node *ulist_next(struct ulist *ulist,
struct ulist_iterator *uiter);