Merge tag '5.11-rc-smb3-part2' of git://git.samba.org/sfrench/cifs-2.6

[linux-2.6-microblaze.git] / fs / btrfs / struct-funcs.c

diff --git a/fs/btrfs/struct-funcs.c b/fs/btrfs/struct-funcs.c
index c46be27..8260f8b 100644 (file)
--- a/fs/btrfs/struct-funcs.c
+++ b/fs/btrfs/struct-funcs.c
@@ -57,8 +57,9 @@ u##bits btrfs_get_token_##bits(struct btrfs_map_token *token,         \
                               const void *ptr, unsigned long off)      \
 {                                                                      \
        const unsigned long member_offset = (unsigned long)ptr + off;   \
-       const unsigned long idx = member_offset >> PAGE_SHIFT;          \
-       const unsigned long oip = offset_in_page(member_offset);        \
+       const unsigned long idx = get_eb_page_index(member_offset);     \
+       const unsigned long oip = get_eb_offset_in_page(token->eb,      \
+                                                       member_offset); \
        const int size = sizeof(u##bits);                               \
        u8 lebytes[sizeof(u##bits)];                                    \
        const int part = PAGE_SIZE - oip;                               \
@@ -85,8 +86,8 @@ u##bits btrfs_get_##bits(const struct extent_buffer *eb,              \
                         const void *ptr, unsigned long off)            \
 {                                                                      \
        const unsigned long member_offset = (unsigned long)ptr + off;   \
-       const unsigned long oip = offset_in_page(member_offset);        \
-       const unsigned long idx = member_offset >> PAGE_SHIFT;          \
+       const unsigned long oip = get_eb_offset_in_page(eb, member_offset); \
+       const unsigned long idx = get_eb_page_index(member_offset);     \
        char *kaddr = page_address(eb->pages[idx]);                     \
        const int size = sizeof(u##bits);                               \
        const int part = PAGE_SIZE - oip;                               \
@@ -106,8 +107,9 @@ void btrfs_set_token_##bits(struct btrfs_map_token *token,          \
                            u##bits val)                                \
 {                                                                      \
        const unsigned long member_offset = (unsigned long)ptr + off;   \
-       const unsigned long idx = member_offset >> PAGE_SHIFT;          \
-       const unsigned long oip = offset_in_page(member_offset);        \
+       const unsigned long idx = get_eb_page_index(member_offset);     \
+       const unsigned long oip = get_eb_offset_in_page(token->eb,      \
+                                                       member_offset); \
        const int size = sizeof(u##bits);                               \
        u8 lebytes[sizeof(u##bits)];                                    \
        const int part = PAGE_SIZE - oip;                               \
@@ -136,8 +138,8 @@ void btrfs_set_##bits(const struct extent_buffer *eb, void *ptr,    \
                      unsigned long off, u##bits val)                   \
 {                                                                      \
        const unsigned long member_offset = (unsigned long)ptr + off;   \
-       const unsigned long oip = offset_in_page(member_offset);        \
-       const unsigned long idx = member_offset >> PAGE_SHIFT;          \
+       const unsigned long oip = get_eb_offset_in_page(eb, member_offset); \
+       const unsigned long idx = get_eb_page_index(member_offset);     \
        char *kaddr = page_address(eb->pages[idx]);                     \
        const int size = sizeof(u##bits);                               \
        const int part = PAGE_SIZE - oip;                               \