From 03db11eb3a872b77aac3f315a78362fa9d8aa270 Mon Sep 17 00:00:00 2001
From: Trent Nelson <trent@solana.com>
Date: Mon, 13 Dec 2021 08:48:40 -0700
Subject: [PATCH] Revert "Spit log data charge into two (#21349) (#21352)"

This reverts commit b63617a3e17f0960f89541656c2f03cd13e993a1.
---
 programs/bpf_loader/src/syscalls.rs | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/programs/bpf_loader/src/syscalls.rs b/programs/bpf_loader/src/syscalls.rs
index 7448890e08..b9aefbb3b1 100644
--- a/programs/bpf_loader/src/syscalls.rs
+++ b/programs/bpf_loader/src/syscalls.rs
@@ -2725,14 +2725,11 @@ impl<'a> SyscallObject<BpfError> for SyscallLogData<'a> {
                 budget
                     .syscall_base_cost
                     .saturating_mul(untranslated_fields.len() as u64)
-            ),
-            result
-        );
-        question_mark!(
-            invoke_context.get_compute_meter().consume(
-                untranslated_fields
-                    .iter()
-                    .fold(0, |total, e| total.saturating_add(e.len() as u64))
+                    .saturating_add(
+                        untranslated_fields
+                            .iter()
+                            .fold(0, |total, e| total.saturating_add(e.len() as u64))
+                    )
             ),
             result
         );