1 files changed, 11 insertions, 11 deletions

diff --git a/src/mongo/db/s/operation_sharding_state.cpp b/src/mongo/db/s/operation_sharding_state.cpp
index 0f92bbd5492..fc13bf41287 100644
--- a/src/mongo/db/s/operation_sharding_state.cpp
+++ b/src/mongo/db/s/operation_sharding_state.cpp
@@ -46,8 +46,8 @@ const Microseconds kMaxWaitForMigrationCriticalSection = Minutes(5);
 
 OperationShardingState::OperationShardingState() = default;
 
-OperationShardingState& OperationShardingState::get(OperationContext* txn) {
-    return shardingMetadataDecoration(txn);
+OperationShardingState& OperationShardingState::get(OperationContext* opCtx) {
+    return shardingMetadataDecoration(opCtx);
 }
 
 void OperationShardingState::initializeShardVersion(NamespaceString nss,
@@ -101,15 +101,15 @@ void OperationShardingState::unsetShardVersion(NamespaceString nss) {
     _clear();
 }
 
-bool OperationShardingState::waitForMigrationCriticalSectionSignal(OperationContext* txn) {
+bool OperationShardingState::waitForMigrationCriticalSectionSignal(OperationContext* opCtx) {
     // Must not block while holding a lock
-    invariant(!txn->lockState()->isLocked());
+    invariant(!opCtx->lockState()->isLocked());
 
     if (_migrationCriticalSectionSignal) {
         _migrationCriticalSectionSignal->waitFor(
-            txn,
-            txn->hasDeadline()
-                ? std::min(txn->getRemainingMaxTimeMicros(), kMaxWaitForMigrationCriticalSection)
+            opCtx,
+            opCtx->hasDeadline()
+                ? std::min(opCtx->getRemainingMaxTimeMicros(), kMaxWaitForMigrationCriticalSection)
                 : kMaxWaitForMigrationCriticalSection);
         _migrationCriticalSectionSignal = nullptr;
         return true;
@@ -130,10 +130,10 @@ void OperationShardingState::_clear() {
     _ns = NamespaceString();
 }
 
-OperationShardingState::IgnoreVersioningBlock::IgnoreVersioningBlock(OperationContext* txn,
+OperationShardingState::IgnoreVersioningBlock::IgnoreVersioningBlock(OperationContext* opCtx,
                                                                      const NamespaceString& ns)
-    : _txn(txn), _ns(ns) {
-    auto& oss = OperationShardingState::get(txn);
+    : _opCtx(opCtx), _ns(ns) {
+    auto& oss = OperationShardingState::get(opCtx);
     _hadOriginalVersion = oss._hasVersion;
     if (_hadOriginalVersion) {
         _originalVersion = oss.getShardVersion(ns);
@@ -142,7 +142,7 @@ OperationShardingState::IgnoreVersioningBlock::IgnoreVersioningBlock(OperationCo
 }
 
 OperationShardingState::IgnoreVersioningBlock::~IgnoreVersioningBlock() {
-    auto& oss = OperationShardingState::get(_txn);
+    auto& oss = OperationShardingState::get(_opCtx);
     invariant(ChunkVersion::isIgnoredVersion(oss.getShardVersion(_ns)));
     if (_hadOriginalVersion) {
         oss.setShardVersion(_ns, _originalVersion);