Reviewed-by: Greg Farnum <greg@xxxxxxxxxxx> On Sun, Mar 17, 2013 at 7:51 AM, Yan, Zheng <zheng.z.yan@xxxxxxxxx> wrote: > From: "Yan, Zheng" <zheng.z.yan@xxxxxxxxx> > > Signed-off-by: Yan, Zheng <zheng.z.yan@xxxxxxxxx> > --- > src/mds/MDCache.cc | 12 ++++++++++++ > 1 file changed, 12 insertions(+) > > diff --git a/src/mds/MDCache.cc b/src/mds/MDCache.cc > index f4622de..194f983 100644 > --- a/src/mds/MDCache.cc > +++ b/src/mds/MDCache.cc > @@ -4327,6 +4327,12 @@ void MDCache::handle_cache_rejoin_strong(MMDSCacheRejoin *strong) > dout(10) << " dn xlock by " << r << " on " << *dn << dendl; > MDRequest *mdr = request_get(r.reqid); // should have this from auth_pin above. > assert(mdr->is_auth_pinned(dn)); > + if (!mdr->xlocks.count(&dn->versionlock)) { > + assert(dn->versionlock.can_xlock_local()); > + dn->versionlock.get_xlock(mdr, mdr->get_client()); > + mdr->xlocks.insert(&dn->versionlock); > + mdr->locks.insert(&dn->versionlock); > + } > if (dn->lock.is_stable()) > dn->auth_pin(&dn->lock); > dn->lock.set_state(LOCK_XLOCK); > @@ -4421,6 +4427,12 @@ void MDCache::handle_cache_rejoin_strong(MMDSCacheRejoin *strong) > dout(10) << " inode xlock by " << q->second << " on " << *lock << " on " << *in << dendl; > MDRequest *mdr = request_get(q->second.reqid); // should have this from auth_pin above. > assert(mdr->is_auth_pinned(in)); > + if (!mdr->xlocks.count(&in->versionlock)) { > + assert(in->versionlock.can_xlock_local()); > + in->versionlock.get_xlock(mdr, mdr->get_client()); > + mdr->xlocks.insert(&in->versionlock); > + mdr->locks.insert(&in->versionlock); > + } > if (lock->is_stable()) > in->auth_pin(lock); > lock->set_state(LOCK_XLOCK); > -- > 1.7.11.7 > -- To unsubscribe from this list: send the line "unsubscribe ceph-devel" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html