diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-05-05 03:57:27 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-05-05 03:57:27 -0400 |
| commit | e8c8ce54807b19e90ac84e609b13f7d4e337eab1 (patch) | |
| tree | ae7d65ae17d55aee197b605ce1a193fe594af614 /fs/btrfs/struct-funcs.c | |
| parent | 5db4298133d99b3dfc60d6899ac9df169769c899 (diff) | |
| parent | 04974df8049fc4240d22759a91e035082ccd18b4 (diff) | |
Merge tag 'v4.6-rc6' into locking/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'fs/btrfs/struct-funcs.c')
| -rw-r--r-- | fs/btrfs/struct-funcs.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/btrfs/struct-funcs.c b/fs/btrfs/struct-funcs.c index b976597b0721..e05619f241be 100644 --- a/fs/btrfs/struct-funcs.c +++ b/fs/btrfs/struct-funcs.c | |||
| @@ -66,7 +66,7 @@ u##bits btrfs_get_token_##bits(struct extent_buffer *eb, void *ptr, \ | |||
| 66 | \ | 66 | \ |
| 67 | if (token && token->kaddr && token->offset <= offset && \ | 67 | if (token && token->kaddr && token->offset <= offset && \ |
| 68 | token->eb == eb && \ | 68 | token->eb == eb && \ |
| 69 | (token->offset + PAGE_CACHE_SIZE >= offset + size)) { \ | 69 | (token->offset + PAGE_SIZE >= offset + size)) { \ |
| 70 | kaddr = token->kaddr; \ | 70 | kaddr = token->kaddr; \ |
| 71 | p = kaddr + part_offset - token->offset; \ | 71 | p = kaddr + part_offset - token->offset; \ |
| 72 | res = get_unaligned_le##bits(p + off); \ | 72 | res = get_unaligned_le##bits(p + off); \ |
| @@ -104,7 +104,7 @@ void btrfs_set_token_##bits(struct extent_buffer *eb, \ | |||
| 104 | \ | 104 | \ |
| 105 | if (token && token->kaddr && token->offset <= offset && \ | 105 | if (token && token->kaddr && token->offset <= offset && \ |
| 106 | token->eb == eb && \ | 106 | token->eb == eb && \ |
| 107 | (token->offset + PAGE_CACHE_SIZE >= offset + size)) { \ | 107 | (token->offset + PAGE_SIZE >= offset + size)) { \ |
| 108 | kaddr = token->kaddr; \ | 108 | kaddr = token->kaddr; \ |
| 109 | p = kaddr + part_offset - token->offset; \ | 109 | p = kaddr + part_offset - token->offset; \ |
| 110 | put_unaligned_le##bits(val, p + off); \ | 110 | put_unaligned_le##bits(val, p + off); \ |