summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSage Weil <sage@newdream.net>2010-10-15 18:37:40 +0200
committerSage Weil <sage@newdream.net>2010-10-15 22:41:03 +0200
commit0e472d4a5a2064a2abc3f3daefa4892868ef8ebd (patch)
tree3883f3c00757f86da2ffb801ad40488a54476988
parentmds: take nestlock wrlock when projecting rstat into dirfrag (diff)
downloadceph-0e472d4a5a2064a2abc3f3daefa4892868ef8ebd.tar.xz
ceph-0e472d4a5a2064a2abc3f3daefa4892868ef8ebd.zip
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>
-rw-r--r--src/mds/CInode.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mds/CInode.cc b/src/mds/CInode.cc
index 1914d4a4461..5cbf666fcee 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;