1 files changed, 10 insertions, 15 deletions

diff --git a/src/third_party/wiredtiger/src/btree/bt_ret.c b/src/third_party/wiredtiger/src/btree/bt_ret.c
index b182b1f8468..d9d1d8263a8 100644
--- a/src/third_party/wiredtiger/src/btree/bt_ret.c
+++ b/src/third_party/wiredtiger/src/btree/bt_ret.c
@@ -13,17 +13,15 @@
  *     Change the cursor to reference an internal return key.
  */
 static inline int
-__key_return(WT_CURSOR_BTREE *cbt)
+__key_return(WT_SESSION_IMPL *session, WT_CURSOR_BTREE *cbt)
 {
     WT_CURSOR *cursor;
     WT_ITEM *tmp;
     WT_PAGE *page;
     WT_ROW *rip;
-    WT_SESSION_IMPL *session;
 
     page = cbt->ref->page;
     cursor = &cbt->iface;
-    session = (WT_SESSION_IMPL *)cbt->iface.session;
 
     if (page->type == WT_PAGE_ROW_LEAF) {
         rip = &page->pg_row[cbt->slot];
@@ -74,7 +72,7 @@ __key_return(WT_CURSOR_BTREE *cbt)
  *     Change the cursor to reference an internal original-page return value.
  */
 static inline int
-__value_return(WT_CURSOR_BTREE *cbt)
+__value_return(WT_SESSION_IMPL *session, WT_CURSOR_BTREE *cbt)
 {
     WT_BTREE *btree;
     WT_CELL *cell;
@@ -82,10 +80,8 @@ __value_return(WT_CURSOR_BTREE *cbt)
     WT_CURSOR *cursor;
     WT_PAGE *page;
     WT_ROW *rip;
-    WT_SESSION_IMPL *session;
     uint8_t v;
 
-    session = (WT_SESSION_IMPL *)cbt->iface.session;
     btree = S2BT(session);
 
     page = cbt->ref->page;
@@ -127,18 +123,17 @@ __value_return(WT_CURSOR_BTREE *cbt)
  *     Change the cursor to reference an internal update structure return value.
  */
 int
-__wt_value_return_upd(WT_CURSOR_BTREE *cbt, WT_UPDATE *upd, bool ignore_visibility)
+__wt_value_return_upd(
+  WT_SESSION_IMPL *session, WT_CURSOR_BTREE *cbt, WT_UPDATE *upd, bool ignore_visibility)
 {
     WT_CURSOR *cursor;
     WT_DECL_RET;
-    WT_SESSION_IMPL *session;
     WT_UPDATE **listp, *list[WT_MODIFY_ARRAY_SIZE];
     size_t allocated_bytes;
     u_int i;
     bool skipped_birthmark;
 
     cursor = &cbt->iface;
-    session = (WT_SESSION_IMPL *)cbt->iface.session;
     allocated_bytes = 0;
 
     /*
@@ -217,7 +212,7 @@ __wt_value_return_upd(WT_CURSOR_BTREE *cbt, WT_UPDATE *upd, bool ignore_visibili
              */
             WT_ASSERT(session, cbt->slot != UINT32_MAX);
 
-            WT_ERR(__value_return(cbt));
+            WT_ERR(__value_return(session, cbt));
         }
     } else if (upd->type == WT_UPDATE_TOMBSTONE)
         WT_ERR(__wt_buf_set(session, &cursor->value, "", 0));
@@ -241,7 +236,7 @@ err:
  *     Change the cursor to reference an internal return key.
  */
 int
-__wt_key_return(WT_CURSOR_BTREE *cbt)
+__wt_key_return(WT_SESSION_IMPL *session, WT_CURSOR_BTREE *cbt)
 {
     WT_CURSOR *cursor;
 
@@ -257,7 +252,7 @@ __wt_key_return(WT_CURSOR_BTREE *cbt)
      */
     F_CLR(cursor, WT_CURSTD_KEY_EXT);
     if (!F_ISSET(cursor, WT_CURSTD_KEY_INT)) {
-        WT_RET(__key_return(cbt));
+        WT_RET(__key_return(session, cbt));
         F_SET(cursor, WT_CURSTD_KEY_INT);
     }
     return (0);
@@ -268,7 +263,7 @@ __wt_key_return(WT_CURSOR_BTREE *cbt)
  *     Change the cursor to reference an internal return value.
  */
 int
-__wt_value_return(WT_CURSOR_BTREE *cbt, WT_UPDATE *upd)
+__wt_value_return(WT_SESSION_IMPL *session, WT_CURSOR_BTREE *cbt, WT_UPDATE *upd)
 {
     WT_CURSOR *cursor;
 
@@ -276,9 +271,9 @@ __wt_value_return(WT_CURSOR_BTREE *cbt, WT_UPDATE *upd)
 
     F_CLR(cursor, WT_CURSTD_VALUE_EXT);
     if (upd == NULL)
-        WT_RET(__value_return(cbt));
+        WT_RET(__value_return(session, cbt));
     else
-        WT_RET(__wt_value_return_upd(cbt, upd, false));
+        WT_RET(__wt_value_return_upd(session, cbt, upd, false));
     F_SET(cursor, WT_CURSTD_VALUE_INT);
     return (0);
 }