From f7ea95aed17e39bff94500a5cf51c738569157ca Mon Sep 17 00:00:00 2001
From: Greg Fitzgerald <greg@solana.com>
Date: Fri, 7 Sep 2018 12:11:02 -0600
Subject: [PATCH] Hoist lock, reposition parameters

---
 src/window.rs | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/window.rs b/src/window.rs
index 2f309fcbc6..a8e06d493b 100644
--- a/src/window.rs
+++ b/src/window.rs
@@ -261,17 +261,16 @@ fn retransmit_all_leader_blocks(
 /// * `consumed` - input/output, the entry-height to which this
 ///                 node has populated and rebroadcast entries
 fn process_blob(
+    window: &mut Window,
     id: &Pubkey,
     blob: SharedBlob,
     pix: u64,
     consume_queue: &mut SharedBlobs,
-    window: &SharedWindow,
     recycler: &BlobRecycler,
     consumed: &mut u64,
     leader_unknown: bool,
     pending_retransmits: &mut bool,
 ) {
-    let mut window = window.write().unwrap();
     let w = (pix % WINDOW_SIZE) as usize;
 
     let is_coding = {
@@ -453,11 +452,11 @@ fn recv_window(
         trace!("{} window pix: {} size: {}", id, pix, meta_size);
 
         process_blob(
+            &mut window.write().unwrap(),
             id,
             b,
             pix,
             &mut consume_queue,
-            window,
             recycler,
             consumed,
             leader_unknown,