From: Alexandre Oliva Date: Tue, 17 Dec 2013 11:00:00 +0000 (-0200) Subject: mds: drop unused find_ino_dir X-Git-Tag: v0.75~89 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f5d32a33d25a5f9ddccadb4c3ebbd5ccd211204f;p=ceph.git mds: drop unused find_ino_dir Remove all traces of find_ino_dir, it is no longer used. Signed-off-by: Alexandre Oliva --- diff --git a/src/mds/MDCache.cc b/src/mds/MDCache.cc index 451db8afc5ec..0c7f11e68a30 100644 --- a/src/mds/MDCache.cc +++ b/src/mds/MDCache.cc @@ -8641,57 +8641,6 @@ void MDCache::kick_find_ino_peers(int who) } } -/* ---------------------------- */ - -struct C_MDS_FindInoDir : public Context { - MDCache *mdcache; - inodeno_t ino; - Context *fin; - bufferlist bl; - C_MDS_FindInoDir(MDCache *m, inodeno_t i, Context *f) : mdcache(m), ino(i), fin(f) {} - void finish(int r) { - mdcache->_find_ino_dir(ino, fin, bl, r); - } -}; - -void MDCache::find_ino_dir(inodeno_t ino, Context *fin) -{ - dout(10) << "find_ino_dir " << ino << dendl; - assert(!have_inode(ino)); - - // get the backtrace from the dir - object_t oid = CInode::get_object_name(ino, frag_t(), ""); - object_locator_t oloc(mds->mdsmap->get_metadata_pool()); - - C_MDS_FindInoDir *c = new C_MDS_FindInoDir(this, ino, fin); - mds->objecter->getxattr(oid, oloc, "path", CEPH_NOSNAP, &c->bl, 0, c); -} - -void MDCache::_find_ino_dir(inodeno_t ino, Context *fin, bufferlist& bl, int r) -{ - dout(10) << "_find_ino_dir " << ino << " got " << r << " " << bl.length() << " bytes" << dendl; - if (r < 0) { - fin->complete(r); - return; - } - - string s(bl.c_str(), bl.length()); - filepath path(s.c_str()); - vector trace; - - dout(10) << "_find_ino_dir traversing to path " << path << dendl; - - C_MDS_FindInoDir *c = new C_MDS_FindInoDir(this, ino, fin); - c->bl = bl; - r = path_traverse(NULL, NULL, c, path, &trace, NULL, MDS_TRAVERSE_DISCOVER); - if (r > 0) - return; - delete c; // path_traverse doesn't clean it up for us for r <= 0 - - fin->complete(r); -} - - /* ---------------------------- */ int MDCache::get_num_client_requests() diff --git a/src/mds/MDCache.h b/src/mds/MDCache.h index c61fe394c4f3..5e431c0456cc 100644 --- a/src/mds/MDCache.h +++ b/src/mds/MDCache.h @@ -844,15 +844,6 @@ public: void handle_find_ino_reply(MMDSFindInoReply *m); void kick_find_ino_peers(int who); - // -- find_ino_dir -- - struct find_ino_dir_info_t { - inodeno_t ino; - Context *fin; - }; - - void find_ino_dir(inodeno_t ino, Context *c); - void _find_ino_dir(inodeno_t ino, Context *c, bufferlist& bl, int r); - // -- anchors -- public: void anchor_create_prep_locks(MDRequest *mdr, CInode *in, set& rdlocks,