From 9cfd98da046e9669505910159a7f21f3ad5e291e Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Thu, 11 Mar 2010 09:57:36 -0800 Subject: [PATCH] mds: simplify LocalLock wrlock methods --- src/mds/LocalLock.h | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/src/mds/LocalLock.h b/src/mds/LocalLock.h index 933f5b6d2256b..feac042291d7a 100644 --- a/src/mds/LocalLock.h +++ b/src/mds/LocalLock.h @@ -32,21 +32,16 @@ public: } void get_wrlock(client_t client) { assert(can_wrlock()); - if (num_wrlock == 0) parent->get(MDSCacheObject::PIN_LOCK); - ++num_wrlock; + SimpleLock::get_wrlock(); last_wrlock_client = client; } void put_wrlock() { - --num_wrlock; - if (num_wrlock == 0) { - parent->put(MDSCacheObject::PIN_LOCK); + SimpleLock::put_wrlock(); + if (get_num_wrlocks() == 0) last_wrlock_client = client_t(); - } } - bool is_wrlocked() { return num_wrlock > 0; } - int get_num_wrlocks() { return num_wrlock; } client_t get_last_wrlock_client() { return last_wrlock_client; } - + virtual void print(ostream& out) { out << "("; _print(out); -- 2.39.5