From a0d93d14160efe288a88cc2c8be594713ec731f2 Mon Sep 17 00:00:00 2001
From: Ingo Weinhold <ingo_weinhold@gmx.de>
Date: Mon, 3 Jan 2011 00:44:40 +0000
Subject: [PATCH] * VMCache::Unlock(): Renamed local variable consumerLocked to
 avoid shadowing   the parameter (CID 5329). * _MergeWithOnlyConsumer():
 Removed the somewhat weird consumerLocked   parameter. The caller can unlock
 itself, if desired. Improves Unlock()   readability.

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@40084 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 headers/private/kernel/vm/VMCache.h |  2 +-
 src/system/kernel/vm/VMCache.cpp    | 24 +++++++++++-------------
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/headers/private/kernel/vm/VMCache.h b/headers/private/kernel/vm/VMCache.h
index 186c47a36a..21f5a6456b 100644
--- a/headers/private/kernel/vm/VMCache.h
+++ b/headers/private/kernel/vm/VMCache.h
@@ -192,7 +192,7 @@ private:
 
 	inline	bool				_IsMergeable() const;
 
-			void				_MergeWithOnlyConsumer(bool consumerLocked);
+			void				_MergeWithOnlyConsumer();
 			void				_RemoveConsumer(VMCache* consumer);
 
 private:
diff --git a/src/system/kernel/vm/VMCache.cpp b/src/system/kernel/vm/VMCache.cpp
index 7b77431070..ac371cbe2b 100644
--- a/src/system/kernel/vm/VMCache.cpp
+++ b/src/system/kernel/vm/VMCache.cpp
@@ -682,27 +682,28 @@ VMCache::Unlock(bool consumerLocked)
 	while (fRefCount == 1 && _IsMergeable()) {
 		VMCache* consumer = (VMCache*)list_get_first_item(&consumers);
 		if (consumerLocked) {
-			_MergeWithOnlyConsumer(true);
+			_MergeWithOnlyConsumer();
 		} else if (consumer->TryLock()) {
-			_MergeWithOnlyConsumer(false);
+			_MergeWithOnlyConsumer();
+			consumer->Unlock();
 		} else {
 			// Someone else has locked the consumer ATM. Unlock this cache and
 			// wait for the consumer lock. Increment the cache's ref count
 			// temporarily, so that no one else will try what we are doing or
 			// delete the cache.
 			fRefCount++;
-			bool consumerLocked = consumer->SwitchLock(&fLock);
+			bool consumerLockedTemp = consumer->SwitchLock(&fLock);
 			Lock();
 			fRefCount--;
 
-			if (consumerLocked) {
+			if (consumerLockedTemp) {
 				if (fRefCount == 1 && _IsMergeable()
 						&& consumer == list_get_first_item(&consumers)) {
-					_MergeWithOnlyConsumer(false);
-				} else {
-					// something changed, get rid of the consumer lock
-					consumer->Unlock();
+					// nothing has changed in the meantime -- merge
+					_MergeWithOnlyConsumer();
 				}
+
+				consumer->Unlock();
 			}
 		}
 	}
@@ -1359,10 +1360,10 @@ VMCache::_NotifyPageEvents(vm_page* page, uint32 events)
 
 /*!	Merges the given cache with its only consumer.
 	The caller must hold both the cache's and the consumer's lock. The method
-	will unlock the consumer lock.
+	does release neither lock.
 */
 void
-VMCache::_MergeWithOnlyConsumer(bool consumerLocked)
+VMCache::_MergeWithOnlyConsumer()
 {
 	VMCache* consumer = (VMCache*)list_remove_head_item(&consumers);
 
@@ -1392,9 +1393,6 @@ VMCache::_MergeWithOnlyConsumer(bool consumerLocked)
 	// Release the reference the cache's consumer owned. The consumer takes
 	// over the cache's ref to its source (if any) instead.
 	ReleaseRefLocked();
-
-	if (!consumerLocked)
-		consumer->Unlock();
 }