From: Yan, Zheng <zyan@redhat.com>
Date: Sat, 3 Jun 2017 03:42:12 +0000 (+0800)
Subject: mds/flock: don't import ceph_lock_state_t::waiting_locks
X-Git-Tag: v12.1.0~129^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8d777c4855b0c8e58a8d6966371698b8b7721a42;p=ceph.git

mds/flock: don't import ceph_lock_state_t::waiting_locks

Item in waiting_locks is associated with flock mds request in
exporter mds. If client re-sends the flock mds request to the
importer, the importer starts a new MDRequest. The new one's
'flock_was_waiting' is false.

Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
---

diff --git a/src/mds/flock.h b/src/mds/flock.h
index cceb78e7a942..142e4d127087 100644
--- a/src/mds/flock.h
+++ b/src/mds/flock.h
@@ -252,21 +252,11 @@ private:
 public:
   void encode(bufferlist& bl) const {
     ::encode(held_locks, bl);
-    ::encode(waiting_locks, bl);
     ::encode(client_held_lock_counts, bl);
-    ::encode(client_waiting_lock_counts, bl);
   }
   void decode(bufferlist::iterator& bl) {
     ::decode(held_locks, bl);
-    ::decode(waiting_locks, bl);
     ::decode(client_held_lock_counts, bl);
-    ::decode(client_waiting_lock_counts, bl);
-  }
-  void clear() {
-    held_locks.clear();
-    waiting_locks.clear();
-    client_held_lock_counts.clear();
-    client_waiting_lock_counts.clear();
   }
   bool empty() const {
     return held_locks.empty() && waiting_locks.empty() &&