client: remove Inode dir_contacts field

...nothing uses this, and it's not quite clear what it's for in the
first place.

Signed-off-by: Jeff Layton <jlayton@redhat.com>
(cherry picked from commit d070deef7de40d2af3b551665ced8396e4bd8e2a)

diff --git a/src/client/Client.cc b/src/client/Client.cc
index 5b15069e33f23695f43fbd898e1c6461adea001a..7248547123e7bde10712ec3ad630abc62ae58ab6 100644 (file)
--- a/src/client/Client.cc
+++ b/src/client/Client.cc
@@ -1035,20 +1035,6 @@ void Client::update_dir_dist(Inode *in, DirStat *dst)
 
   // replicated
   in->dir_replicated = !dst->dist.empty();  // FIXME that's just one frag!
-  
-  // dist
-  /*
-  if (!st->dirfrag_dist.empty()) {   // FIXME
-    set<int> dist = st->dirfrag_dist.begin()->second;
-    if (dist.empty() && !in->dir_contacts.empty())
-      ldout(cct, 9) << "lost dist spec for " << in->ino 
-              << " " << dist << dendl;
-    if (!dist.empty() && in->dir_contacts.empty()) 
-      ldout(cct, 9) << "got dist spec for " << in->ino 
-              << " " << dist << dendl;
-    in->dir_contacts = dist;
-  }
-  */
 }
 
 void Client::clear_dir_complete_and_ordered(Inode *diri, bool complete)

diff --git a/src/client/Inode.cc b/src/client/Inode.cc
index 1a03e7d9243b029fe00e1248d1af890b9a092d28..3540bcca87ec4f36ad69517bdeaf6670129371af 100644 (file)
--- a/src/client/Inode.cc
+++ b/src/client/Inode.cc
@@ -441,12 +441,6 @@ void Inode::dump(Formatter *f) const
   f->dump_unsigned("flags", flags);
 
   if (is_dir()) {
-    if (!dir_contacts.empty()) {
-      f->open_object_section("dir_contants");
-      for (set<int>::iterator p = dir_contacts.begin(); p != dir_contacts.end(); ++p)
-       f->dump_int("mds", *p);
-      f->close_section();
-    }
     f->dump_int("dir_hashed", (int)dir_hashed);
     f->dump_int("dir_replicated", (int)dir_replicated);
   }

diff --git a/src/client/Inode.h b/src/client/Inode.h
index f8505c8f9693940f96743422eee002312ea75c66..515d8c2acea9a612d2d1c1978f09af4721f114c8 100644 (file)
--- a/src/client/Inode.h
+++ b/src/client/Inode.h
@@ -188,7 +188,6 @@ struct Inode {
   // about the dir (if this is one!)
   Dir       *dir;     // if i'm a dir.
   fragtree_t dirfragtree;
-  set<int>  dir_contacts;
   uint64_t dir_release_count, dir_ordered_count;
   bool dir_hashed, dir_replicated;