From: Patrick Donnelly <pdonnell@redhat.com>
Date: Wed, 22 Jun 2016 19:18:48 +0000 (-0400)
Subject: mds: use Locker to manage mds_lock
X-Git-Tag: v11.0.0~35^2~2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=ea5d430e11d9cf3f40620f50deaa42eabc75cd19;p=ceph.git

mds: use Locker to manage mds_lock

This makes these blocks consistent with the others for trivial management of
mds_lock.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
---

diff --git a/src/mds/MDSRank.cc b/src/mds/MDSRank.cc
index 16a93485b2b43..9809bc396d0e4 100644
--- a/src/mds/MDSRank.cc
+++ b/src/mds/MDSRank.cc
@@ -1694,13 +1694,11 @@ bool MDSRankDispatcher::handle_asok_command(
       cond.wait();
     }
   } else if (command == "session ls") {
-    mds_lock.Lock();
+    Mutex::Locker l(mds_lock);
 
     heartbeat_reset();
 
     dump_sessions(SessionFilter(), f);
-
-    mds_lock.Unlock();
   } else if (command == "session evict") {
     std::string client_id;
     const bool got_arg = cmd_getval(g_ceph_context, cmdmap, "client_id", client_id);
@@ -1759,9 +1757,8 @@ bool MDSRankDispatcher::handle_asok_command(
       mdcache->dump_cache(path);
     }
   } else if (command == "force_readonly") {
-    mds_lock.Lock();
+    Mutex::Locker l(mds_lock);
     mdcache->force_readonly();
-    mds_lock.Unlock();
   } else if (command == "dirfrag split") {
     Mutex::Locker l(mds_lock);
     command_dirfrag_split(cmdmap, ss);