From 5b464a32f5b3b6c9456dd863e37cde5637207968 Mon Sep 17 00:00:00 2001
From: "Jeff Washington (jwash)" <wash678@gmail.com>
Date: Tue, 21 Dec 2021 16:35:59 -0600
Subject: [PATCH] Disk Buckets: unlock verifies expected (#22052)

---
 bucket_map/src/bucket_storage.rs | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/bucket_map/src/bucket_storage.rs b/bucket_map/src/bucket_storage.rs
index 5677877172..b4c93acfb7 100644
--- a/bucket_map/src/bucket_storage.rs
+++ b/bucket_map/src/bucket_storage.rs
@@ -53,10 +53,9 @@ impl Header {
             false
         }
     }
-    fn unlock(&mut self) -> Uid {
-        let old = self.lock;
+    fn unlock(&mut self, expected: Uid) {
+        assert_eq!(expected, self.lock);
         self.lock = UID_UNLOCKED;
-        old
     }
     fn uid(&self) -> Option<Uid> {
         if self.lock == UID_UNLOCKED {
@@ -188,12 +187,7 @@ impl BucketStorage {
     pub fn free(&mut self, ix: u64, uid: Uid) {
         assert!(ix < self.capacity(), "bad index size");
         assert!(UID_UNLOCKED != uid, "free: bad uid");
-        let previous_uid = self.header_mut_ptr(ix).unlock();
-        assert_eq!(
-            previous_uid, uid,
-            "free: unlocked a header with a differet uid: {}",
-            previous_uid
-        );
+        self.header_mut_ptr(ix).unlock(uid);
         self.count.fetch_sub(1, Ordering::Relaxed);
     }