1 files changed, 15 insertions, 15 deletions

diff --git a/src/mongo/s/client/shard_local.cpp b/src/mongo/s/client/shard_local.cpp
index 54a0af07ba3..5270842a8ba 100644
--- a/src/mongo/s/client/shard_local.cpp
+++ b/src/mongo/s/client/shard_local.cpp
@@ -92,10 +92,10 @@ bool ShardLocal::isRetriableError(ErrorCodes::Error code, RetryPolicy options) {
     }
 }
 
-void ShardLocal::_updateLastOpTimeFromClient(OperationContext* txn,
+void ShardLocal::_updateLastOpTimeFromClient(OperationContext* opCtx,
                                              const repl::OpTime& previousOpTimeOnClient) {
     repl::OpTime lastOpTimeFromClient =
-        repl::ReplClientInfo::forClient(txn->getClient()).getLastOp();
+        repl::ReplClientInfo::forClient(opCtx->getClient()).getLastOp();
     invariant(lastOpTimeFromClient >= previousOpTimeOnClient);
     if (lastOpTimeFromClient.isNull() || lastOpTimeFromClient == previousOpTimeOnClient) {
         return;
@@ -115,19 +115,19 @@ repl::OpTime ShardLocal::_getLastOpTime() {
     return _lastOpTime;
 }
 
-Shard::HostWithResponse ShardLocal::_runCommand(OperationContext* txn,
+Shard::HostWithResponse ShardLocal::_runCommand(OperationContext* opCtx,
                                                 const ReadPreferenceSetting& unused,
                                                 const std::string& dbName,
                                                 Milliseconds maxTimeMSOverrideUnused,
                                                 const BSONObj& cmdObj) {
     repl::OpTime currentOpTimeFromClient =
-        repl::ReplClientInfo::forClient(txn->getClient()).getLastOp();
-    ON_BLOCK_EXIT([this, &txn, &currentOpTimeFromClient] {
-        _updateLastOpTimeFromClient(txn, currentOpTimeFromClient);
+        repl::ReplClientInfo::forClient(opCtx->getClient()).getLastOp();
+    ON_BLOCK_EXIT([this, &opCtx, &currentOpTimeFromClient] {
+        _updateLastOpTimeFromClient(opCtx, currentOpTimeFromClient);
     });
 
     try {
-        DBDirectClient client(txn);
+        DBDirectClient client(opCtx);
         rpc::UniqueReply commandResponse = client.runCommandWithMetadata(
             dbName, cmdObj.firstElementFieldName(), rpc::makeEmptyMetadata(), cmdObj);
         BSONObj responseReply = commandResponse->getCommandReply().getOwned();
@@ -147,29 +147,29 @@ Shard::HostWithResponse ShardLocal::_runCommand(OperationContext* txn,
 }
 
 StatusWith<Shard::QueryResponse> ShardLocal::_exhaustiveFindOnConfig(
-    OperationContext* txn,
+    OperationContext* opCtx,
     const ReadPreferenceSetting& readPref,
     const repl::ReadConcernLevel& readConcernLevel,
     const NamespaceString& nss,
     const BSONObj& query,
     const BSONObj& sort,
     boost::optional<long long> limit) {
-    auto replCoord = repl::ReplicationCoordinator::get(txn);
+    auto replCoord = repl::ReplicationCoordinator::get(opCtx);
 
     if (readConcernLevel == repl::ReadConcernLevel::kMajorityReadConcern) {
         // Set up operation context with majority read snapshot so correct optime can be retrieved.
-        Status status = txn->recoveryUnit()->setReadFromMajorityCommittedSnapshot();
+        Status status = opCtx->recoveryUnit()->setReadFromMajorityCommittedSnapshot();
 
         // Wait for any writes performed by this ShardLocal instance to be committed and visible.
         Status readConcernStatus = replCoord->waitUntilOpTimeForRead(
-            txn, repl::ReadConcernArgs{_getLastOpTime(), readConcernLevel});
+            opCtx, repl::ReadConcernArgs{_getLastOpTime(), readConcernLevel});
         if (!readConcernStatus.isOK()) {
             return readConcernStatus;
         }
 
         // Inform the storage engine to read from the committed snapshot for the rest of this
         // operation.
-        status = txn->recoveryUnit()->setReadFromMajorityCommittedSnapshot();
+        status = opCtx->recoveryUnit()->setReadFromMajorityCommittedSnapshot();
         if (!status.isOK()) {
             return status;
         }
@@ -177,7 +177,7 @@ StatusWith<Shard::QueryResponse> ShardLocal::_exhaustiveFindOnConfig(
         invariant(readConcernLevel == repl::ReadConcernLevel::kLocalReadConcern);
     }
 
-    DBDirectClient client(txn);
+    DBDirectClient client(opCtx);
     Query fullQuery(query);
     if (!sort.isEmpty()) {
         fullQuery.sort(sort);
@@ -207,14 +207,14 @@ StatusWith<Shard::QueryResponse> ShardLocal::_exhaustiveFindOnConfig(
     }
 }
 
-Status ShardLocal::createIndexOnConfig(OperationContext* txn,
+Status ShardLocal::createIndexOnConfig(OperationContext* opCtx,
                                        const NamespaceString& ns,
                                        const BSONObj& keys,
                                        bool unique) {
     invariant(ns.db() == "config" || ns.db() == "admin");
 
     try {
-        DBDirectClient client(txn);
+        DBDirectClient client(opCtx);
         IndexSpec index;
         index.addKeys(keys);
         index.unique(unique);