kvserver: drop removeReplicaRaftMuLocked opts

All callers use the same parameter, so we can inline it.

After this commit, removeInitializedReplicaRaftMuLocked is the only
remaining call accepting RemoveOptions, which makes the scope of these
options clearer.

Epic: none
Release note: none

Author: pav-kv

pkg/kv/kvserver/store_create_replica.go

@@ -116,9 +116,9 @@ func (s *Store) tryGetReplica(
 		}
 
 		repl.mu.RUnlock()
-		if err := s.removeReplicaRaftMuLocked(ctx, repl, id.ReplicaID, "superseded by newer Replica", RemoveOptions{
-			DestroyData: true,
-		}); err != nil {
+		if err := s.removeReplicaRaftMuLocked(
+			ctx, repl, id.ReplicaID, "superseded by newer Replica",
+		); err != nil {
 			log.Fatalf(ctx, "failed to remove replica: %v", err)
 		}
 		repl.raftMu.Unlock()

pkg/kv/kvserver/store_raft.go

@@ -638,9 +638,7 @@ func (s *Store) HandleRaftResponse(
 
 				repl.mu.Unlock()
 				nextReplicaID := tErr.ReplicaID + 1
-				return s.removeReplicaRaftMuLocked(ctx, repl, nextReplicaID, "received ReplicaTooOldError", RemoveOptions{
-					DestroyData: true,
-				})
+				return s.removeReplicaRaftMuLocked(ctx, repl, nextReplicaID, "received ReplicaTooOldError")
 			case *kvpb.RaftGroupDeletedError:
 				if replErr != nil {
 					// RangeNotFoundErrors are expected here; nothing else is.

pkg/kv/kvserver/store_remove_replica.go

@@ -45,23 +45,15 @@ func (s *Store) RemoveReplica(
 	return err
 }
 
-// removeReplicaRaftMuLocked removes the passed replica. If the replica is
-// initialized the RemoveOptions will be consulted.
+// removeReplicaRaftMuLocked removes the passed replica.
 func (s *Store) removeReplicaRaftMuLocked(
-	ctx context.Context,
-	rep *Replica,
-	nextReplicaID roachpb.ReplicaID,
-	reason redact.SafeString,
-	opts RemoveOptions,
+	ctx context.Context, rep *Replica, nextReplicaID roachpb.ReplicaID, reason redact.SafeString,
 ) error {
 	rep.raftMu.AssertHeld()
 	if rep.IsInitialized() {
-		if opts.InsertPlaceholder {
-			return errors.Errorf("InsertPlaceholder unsupported in removeReplicaRaftMuLocked")
-		}
-		_, err := s.removeInitializedReplicaRaftMuLocked(ctx, rep, nextReplicaID, reason, opts)
-		return errors.Wrap(err,
-			"failed to remove replica")
+		_, err := s.removeInitializedReplicaRaftMuLocked(
+			ctx, rep, nextReplicaID, reason, RemoveOptions{DestroyData: true})
+		return errors.Wrap(err, "failed to remove replica")
 	}
 	s.removeUninitializedReplicaRaftMuLocked(ctx, rep, nextReplicaID)
 	return nil