Commit 528c032764f4d3c6cb5f5ece090d9d5882655982
1 parent
1db5df98fa
Exists in
smarc-l5.0.0_1.0.0-ga
and in
5 other branches
btrfs: trivial endianness annotations
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Showing 3 changed files with 8 additions and 7 deletions Side-by-side Diff
fs/btrfs/free-space-cache.c
| ... | ... | @@ -75,7 +75,8 @@ |
| 75 | 75 | return ERR_PTR(-ENOENT); |
| 76 | 76 | } |
| 77 | 77 | |
| 78 | - inode->i_mapping->flags &= ~__GFP_FS; | |
| 78 | + mapping_set_gfp_mask(inode->i_mapping, | |
| 79 | + mapping_gfp_mask(inode->i_mapping) & ~__GFP_FS); | |
| 79 | 80 | |
| 80 | 81 | return inode; |
| 81 | 82 | } |
| ... | ... | @@ -365,7 +366,7 @@ |
| 365 | 366 | |
| 366 | 367 | static void io_ctl_set_generation(struct io_ctl *io_ctl, u64 generation) |
| 367 | 368 | { |
| 368 | - u64 *val; | |
| 369 | + __le64 *val; | |
| 369 | 370 | |
| 370 | 371 | io_ctl_map_page(io_ctl, 1); |
| 371 | 372 | |
| ... | ... | @@ -388,7 +389,7 @@ |
| 388 | 389 | |
| 389 | 390 | static int io_ctl_check_generation(struct io_ctl *io_ctl, u64 generation) |
| 390 | 391 | { |
| 391 | - u64 *gen; | |
| 392 | + __le64 *gen; | |
| 392 | 393 | |
| 393 | 394 | /* |
| 394 | 395 | * Skip the crc area. If we don't check crcs then we just have a 64bit |
fs/btrfs/ulist.c
| ... | ... | @@ -95,7 +95,7 @@ |
| 95 | 95 | * |
| 96 | 96 | * The allocated ulist will be returned in an initialized state. |
| 97 | 97 | */ |
| 98 | -struct ulist *ulist_alloc(unsigned long gfp_mask) | |
| 98 | +struct ulist *ulist_alloc(gfp_t gfp_mask) | |
| 99 | 99 | { |
| 100 | 100 | struct ulist *ulist = kmalloc(sizeof(*ulist), gfp_mask); |
| 101 | 101 | |
| ... | ... | @@ -144,7 +144,7 @@ |
| 144 | 144 | * unaltered. |
| 145 | 145 | */ |
| 146 | 146 | int ulist_add(struct ulist *ulist, u64 val, unsigned long aux, |
| 147 | - unsigned long gfp_mask) | |
| 147 | + gfp_t gfp_mask) | |
| 148 | 148 | { |
| 149 | 149 | int i; |
| 150 | 150 |
fs/btrfs/ulist.h
| ... | ... | @@ -59,10 +59,10 @@ |
| 59 | 59 | void ulist_init(struct ulist *ulist); |
| 60 | 60 | void ulist_fini(struct ulist *ulist); |
| 61 | 61 | void ulist_reinit(struct ulist *ulist); |
| 62 | -struct ulist *ulist_alloc(unsigned long gfp_mask); | |
| 62 | +struct ulist *ulist_alloc(gfp_t gfp_mask); | |
| 63 | 63 | void ulist_free(struct ulist *ulist); |
| 64 | 64 | int ulist_add(struct ulist *ulist, u64 val, unsigned long aux, |
| 65 | - unsigned long gfp_mask); | |
| 65 | + gfp_t gfp_mask); | |
| 66 | 66 | struct ulist_node *ulist_next(struct ulist *ulist, struct ulist_node *prev); |
| 67 | 67 | |
| 68 | 68 | #endif |