1 files changed, 8 insertions, 2 deletions

diff --git a/fs/xfs/libxfs/xfs_rmap_btree.h b/fs/xfs/libxfs/xfs_rmap_btree.h
index a3a6b7d476c7..e73a55357dab 100644
--- a/fs/xfs/libxfs/xfs_rmap_btree.h
+++ b/fs/xfs/libxfs/xfs_rmap_btree.h
@@ -38,12 +38,18 @@ struct xfs_mount;
 #define XFS_RMAP_KEY_ADDR(block, index) \
         ((struct xfs_rmap_key *) \
                 ((char *)(block) + XFS_RMAP_BLOCK_LEN + \
-                 ((index) - 1) * sizeof(struct xfs_rmap_key)))
+                 ((index) - 1) * 2 * sizeof(struct xfs_rmap_key)))
+
+#define XFS_RMAP_HIGH_KEY_ADDR(block, index) \
+        ((struct xfs_rmap_key *) \
+                ((char *)(block) + XFS_RMAP_BLOCK_LEN + \
+                 sizeof(struct xfs_rmap_key) + \
+                 ((index) - 1) * 2 * sizeof(struct xfs_rmap_key)))
 
 #define XFS_RMAP_PTR_ADDR(block, index, maxrecs) \
         ((xfs_rmap_ptr_t *) \
                 ((char *)(block) + XFS_RMAP_BLOCK_LEN + \
-                 (maxrecs) * sizeof(struct xfs_rmap_key) + \
+                 (maxrecs) * 2 * sizeof(struct xfs_rmap_key) + \
                  ((index) - 1) * sizeof(xfs_rmap_ptr_t)))
 
 struct xfs_btree_cur *xfs_rmapbt_init_cursor(struct xfs_mount *mp,