diff options
| author | Alexander Block <ablock84@googlemail.com> | 2012-07-28 16:18:58 +0200 |
|---|---|---|
| committer | Chris Mason <chris.mason@fusionio.com> | 2012-10-01 15:18:53 -0400 |
| commit | 34d73f54e2e2227cece751f168d08d3103092992 (patch) | |
| tree | 08993b77d664256059a6d6bb97d10e67fdb753f8 /fs/btrfs/ulist.h | |
| parent | 7e0926fe5f20b5c88e51cba68512302b10f73d2a (diff) | |
| download | linux-stable-34d73f54e2e2227cece751f168d08d3103092992.tar.gz linux-stable-34d73f54e2e2227cece751f168d08d3103092992.tar.bz2 linux-stable-34d73f54e2e2227cece751f168d08d3103092992.zip | |
Btrfs: make aux field of ulist 64 bit
Btrfs send/receive uses the aux field to store inode numbers. On
32 bit machines this may become a problem.
Also fix all users of ulist_add and ulist_add_merged.
Reported-by: Arne Jansen <sensille@gmx.net>
Signed-off-by: Alexander Block <ablock84@googlemail.com>
Diffstat (limited to 'fs/btrfs/ulist.h')
| -rw-r--r-- | fs/btrfs/ulist.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/fs/btrfs/ulist.h b/fs/btrfs/ulist.h index 21bdc8ec8130..21a1963439c3 100644 --- a/fs/btrfs/ulist.h +++ b/fs/btrfs/ulist.h @@ -33,7 +33,7 @@ struct ulist_iterator { */ struct ulist_node { u64 val; /* value to store */ - unsigned long aux; /* auxiliary value saved along with the val */ + u64 aux; /* auxiliary value saved along with the val */ }; struct ulist { @@ -65,10 +65,9 @@ void ulist_fini(struct ulist *ulist); void ulist_reinit(struct ulist *ulist); 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, - gfp_t gfp_mask); -int ulist_add_merge(struct ulist *ulist, u64 val, unsigned long aux, - unsigned long *old_aux, gfp_t gfp_mask); +int ulist_add(struct ulist *ulist, u64 val, u64 aux, gfp_t gfp_mask); +int ulist_add_merge(struct ulist *ulist, u64 val, u64 aux, + u64 *old_aux, gfp_t gfp_mask); struct ulist_node *ulist_next(struct ulist *ulist, struct ulist_iterator *uiter); |