From: Sage Weil <sage@newdream.net>
Date: Fri, 15 Oct 2010 16:37:40 +0000 (-0700)
Subject: mds: use correct helper when pinning past snaprealm parent
X-Git-Tag: v0.22~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0e472d4a5a2064a2abc3f3daefa4892868ef8ebd;p=ceph.git

mds: use correct helper when pinning past snaprealm parent

The heler also updates the SnapRealm::open_past_parents, which is needed
for the have_past_parents_open() check.

That is used when, among other things, we import caps; not updating it
prevented the cap import from sending the client cap message, which makes
the mds<->client cap relationship get out of sync.

Signed-off-by: Sage Weil <sage@newdream.net>
---

diff --git a/src/mds/CInode.cc b/src/mds/CInode.cc
index 1914d4a4461f..5cbf666fceea 100644
--- a/src/mds/CInode.cc
+++ b/src/mds/CInode.cc
@@ -355,7 +355,7 @@ void CInode::pop_projected_snaprealm(sr_t *next_snaprealm)
     assert(parenti);
     assert(parenti->snaprealm);
     snaprealm->parent = new_parent;
-    parenti->get(PIN_PASTSNAPPARENT);
+    snaprealm->add_open_past_parent(new_parent);
     dout(10) << " realm " << *snaprealm << " past_parents " << snaprealm->srnode.past_parents
 	     << " -> " << next_snaprealm->past_parents << dendl;
     dout(10) << " pinning new parent " << *parenti << dendl;