From: Xiubo Li <xiubli@redhat.com>
Date: Fri, 19 Mar 2021 13:00:02 +0000 (+0800)
Subject: client: move SnapRealm methods to ClientSnapRealm.cc
X-Git-Tag: v17.1.0~1946^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d9736ee9b0efa238876a75ae3ce1b4b42be51c63;p=ceph.git

client: move SnapRealm methods to ClientSnapRealm.cc

Signed-off-by: Xiubo Li <xiubli@redhat.com>
---

diff --git a/src/client/Client.cc b/src/client/Client.cc
index d155341fdc3..7a45461e813 100644
--- a/src/client/Client.cc
+++ b/src/client/Client.cc
@@ -4771,37 +4771,6 @@ void Client::early_kick_flushing_caps(MetaSession *session)
   }
 }
 
-void SnapRealm::build_snap_context()
-{
-  set<snapid_t> snaps;
-  snapid_t max_seq = seq;
-  
-  // start with prior_parents?
-  for (unsigned i=0; i<prior_parent_snaps.size(); i++)
-    snaps.insert(prior_parent_snaps[i]);
-
-  // current parent's snaps
-  if (pparent) {
-    const SnapContext& psnapc = pparent->get_snap_context();
-    for (unsigned i=0; i<psnapc.snaps.size(); i++)
-      if (psnapc.snaps[i] >= parent_since)
-	snaps.insert(psnapc.snaps[i]);
-    if (psnapc.seq > max_seq)
-      max_seq = psnapc.seq;
-  }
-
-  // my snaps
-  for (unsigned i=0; i<my_snaps.size(); i++)
-    snaps.insert(my_snaps[i]);
-
-  // ok!
-  cached_snap_context.seq = max_seq;
-  cached_snap_context.snaps.resize(0);
-  cached_snap_context.snaps.reserve(snaps.size());
-  for (set<snapid_t>::reverse_iterator p = snaps.rbegin(); p != snaps.rend(); ++p)
-    cached_snap_context.snaps.push_back(*p);
-}
-
 void Client::invalidate_snaprealm_and_children(SnapRealm *realm)
 {
   list<SnapRealm*> q;
diff --git a/src/client/ClientSnapRealm.cc b/src/client/ClientSnapRealm.cc
index 3656fbdf505..81154a17069 100644
--- a/src/client/ClientSnapRealm.cc
+++ b/src/client/ClientSnapRealm.cc
@@ -4,6 +4,37 @@
 #include "ClientSnapRealm.h"
 #include "common/Formatter.h"
 
+void SnapRealm::build_snap_context()
+{
+  set<snapid_t> snaps;
+  snapid_t max_seq = seq;
+
+  // start with prior_parents?
+  for (unsigned i=0; i<prior_parent_snaps.size(); i++)
+    snaps.insert(prior_parent_snaps[i]);
+
+  // current parent's snaps
+  if (pparent) {
+    const SnapContext& psnapc = pparent->get_snap_context();
+    for (unsigned i=0; i<psnapc.snaps.size(); i++)
+      if (psnapc.snaps[i] >= parent_since)
+	snaps.insert(psnapc.snaps[i]);
+    if (psnapc.seq > max_seq)
+      max_seq = psnapc.seq;
+  }
+
+  // my snaps
+  for (unsigned i=0; i<my_snaps.size(); i++)
+    snaps.insert(my_snaps[i]);
+
+  // ok!
+  cached_snap_context.seq = max_seq;
+  cached_snap_context.snaps.resize(0);
+  cached_snap_context.snaps.reserve(snaps.size());
+  for (set<snapid_t>::reverse_iterator p = snaps.rbegin(); p != snaps.rend(); ++p)
+    cached_snap_context.snaps.push_back(*p);
+}
+
 void SnapRealm::dump(Formatter *f) const
 {
   f->dump_stream("ino") << ino;