From: Michal Jarzabek <stiopa@gmail.com>
Date: Sun, 30 Oct 2016 15:11:25 +0000 (+0000)
Subject: mds/flock: add const to member functions
X-Git-Tag: v11.1.0~339^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=66bcf0b605cfb85733defff49247cb1d06f4fe54;p=ceph.git

mds/flock: add const to member functions

Signed-off-by: Michal Jarzabek <stiopa@gmail.com>
---

diff --git a/src/mds/flock.cc b/src/mds/flock.cc
index 09557032e07f..dc96d772bc1e 100644
--- a/src/mds/flock.cc
+++ b/src/mds/flock.cc
@@ -28,9 +28,9 @@ ceph_lock_state_t::~ceph_lock_state_t()
   }
 }
 
-bool ceph_lock_state_t::is_waiting(const ceph_filelock &fl)
+bool ceph_lock_state_t::is_waiting(const ceph_filelock &fl) const
 {
-  multimap<uint64_t, ceph_filelock>::iterator p = waiting_locks.find(fl.start);
+  multimap<uint64_t, ceph_filelock>::const_iterator p = waiting_locks.find(fl.start);
   while (p != waiting_locks.end()) {
     if (p->second.start > fl.start)
       return false;
@@ -77,7 +77,7 @@ void ceph_lock_state_t::remove_waiting(const ceph_filelock& fl)
 bool ceph_lock_state_t::is_deadlock(const ceph_filelock& fl,
 				    list<multimap<uint64_t, ceph_filelock>::iterator>&
 				      overlapping_locks,
-				    const ceph_filelock *first_fl, unsigned depth)
+				    const ceph_filelock *first_fl, unsigned depth) const
 {
   ldout(cct,15) << "is_deadlock " << fl << dendl;
 
diff --git a/src/mds/flock.h b/src/mds/flock.h
index 2cf9f0a3927b..cceb78e7a942 100644
--- a/src/mds/flock.h
+++ b/src/mds/flock.h
@@ -87,7 +87,7 @@ public:
    * @param fl The filelock to check for
    * @returns True if the lock is waiting, false otherwise
    */
-  bool is_waiting(const ceph_filelock &fl);
+  bool is_waiting(const ceph_filelock &fl) const;
   /**
    * Remove a lock from the waiting_locks list
    *
@@ -144,7 +144,7 @@ private:
   bool is_deadlock(const ceph_filelock& fl,
 		   list<multimap<uint64_t, ceph_filelock>::iterator>&
 		      overlapping_locks,
-		   const ceph_filelock *first_fl=NULL, unsigned depth=0);
+		   const ceph_filelock *first_fl=NULL, unsigned depth=0) const;
 
   /**
    * Add a lock to the waiting_locks list