From 5c3352ff2998bfa2f79f4a26a8890819bd2571ea Mon Sep 17 00:00:00 2001 From: sageweil Date: Thu, 9 Aug 2007 20:31:54 +0000 Subject: [PATCH] cleanup git-svn-id: https://ceph.svn.sf.net/svnroot/ceph@1610 29311d96-e01e-0410-9327-a35deaab8ce9 --- branches/sage/mds/mds/MDCache.cc | 8 ++++---- branches/sage/mds/mds/Migrator.cc | 19 ------------------- 2 files changed, 4 insertions(+), 23 deletions(-) diff --git a/branches/sage/mds/mds/MDCache.cc b/branches/sage/mds/mds/MDCache.cc index 9825e111851fe..0ee95f853b372 100644 --- a/branches/sage/mds/mds/MDCache.cc +++ b/branches/sage/mds/mds/MDCache.cc @@ -4893,14 +4893,13 @@ void MDCache::handle_discover(MDiscover *dis) } CDir *curdir = cur->get_dirfrag(fg); - // am i dir auth (or if no dir, at least the inode auth) if ((!curdir && !cur->is_auth()) || (curdir && !curdir->is_auth())) { if (curdir) { - dout(7) << *curdir << " not dirfrag auth, setting dir_auth_hint" << endl; + dout(7) << " not dirfrag auth, setting dir_auth_hint for " << *curdir << endl; reply->set_dir_auth_hint(curdir->authority().first); } else { - dout(7) << *cur << " dirfrag not open, not inode auth, setting dir_auth_hint" << endl; + dout(7) << " dirfrag not open, not inode auth, setting dir_auth_hint for " << *cur << endl; reply->set_dir_auth_hint(cur->authority().first); } reply->set_wanted_xlocks_hint(dis->wants_xlocked()); @@ -5193,7 +5192,8 @@ CDir *MDCache::add_replica_dir(CInode *diri, } else { // force frag to leaf in the diri tree if (!diri->dirfragtree.is_leaf(fg)) { - dout(7) << "add_replica_dir forcing frag " << fg << " to leaf in the fragtree" << endl; + dout(7) << "add_replica_dir forcing frag " << fg << " to leaf in the fragtree " + << diri->dirfragtree << endl; diri->dirfragtree.force_to_leaf(fg); } diff --git a/branches/sage/mds/mds/Migrator.cc b/branches/sage/mds/mds/Migrator.cc index a9cbf9f7b7c8e..bb049b59bebe5 100644 --- a/branches/sage/mds/mds/Migrator.cc +++ b/branches/sage/mds/mds/Migrator.cc @@ -1830,18 +1830,6 @@ void Migrator::decode_import_inode(CDentry *dn, bufferlist& bl, int& off, int ol if (in->is_replica(mds->get_nodeid())) in->remove_replica(mds->get_nodeid()); - // twiddle locks - /* - if (in->authlock.do_import(oldauth, mds->get_nodeid())) - mds->locker->simple_eval(&in->authlock); - if (in->linklock.do_import(oldauth, mds->get_nodeid())) - mds->locker->simple_eval(&in->linklock); - if (in->dirfragtreelock.do_import(oldauth, mds->get_nodeid())) - mds->locker->simple_eval(&in->dirfragtreelock); - if (in->dirlock.do_import(oldauth, mds->get_nodeid())) - mds->locker->scatter_eval(&in->dirlock); - */ - // caps for (set::iterator it = merged_client_caps.begin(); it != merged_client_caps.end(); @@ -1854,12 +1842,6 @@ void Migrator::decode_import_inode(CDentry *dn, bufferlist& bl, int& off, int ol caps->set_mds( oldauth ); // reap from whom? mds->send_message_client_maybe_open(caps, imported_client_map[*it]); } - - // filelock - /* - if (in->filelock.do_import(oldauth, mds->get_nodeid())) - mds->locker->simple_eval(&in->filelock); - */ } @@ -1920,7 +1902,6 @@ int Migrator::decode_import_dir(bufferlist& bl, long nden = dstate.get_nden(); for (; nden>0; nden--) { - num_imported++; // dentry -- 2.39.5