class: rename ClassList -> ClassLibrary

diff --git a/src/ceph.cc b/src/ceph.cc
index c2a3c5255b99ce181d84d6c1c30577775aaa61e7..fbd1ecec5c020b21b0ceb97e12426657615d9222 100644 (file)
--- a/src/ceph.cc
+++ b/src/ceph.cc
@@ -182,7 +182,7 @@ void handle_notify(MMonObserveNotify *notify)
     {
       bufferlist::iterator p = notify->bl.begin();
       if (notify->is_latest) {
-       ClassList list;
+       ClassLibrary list;
        ::decode(list, p);
        // show the first class info
         map<string, ClassInfo>::iterator iter = list.library_map.begin();

diff --git a/src/include/ClassEntry.h b/src/include/ClassEntry.h
index 9d607600e61eca5669e9cd55aa31731ec48fa6b0..b429c57a465ae17ce2408b8ffbe59ab458bc2606 100644 (file)
--- a/src/include/ClassEntry.h
+++ b/src/include/ClassEntry.h
@@ -82,11 +82,11 @@ struct ClassLibraryIncremental {
 
 WRITE_CLASS_ENCODER(ClassLibraryIncremental)
 
-struct ClassList {
+struct ClassLibrary {
   version_t version;
   map<string, ClassInfo> library_map;
 
-  ClassList() : version(0) {}
+  ClassLibrary() : version(0) {}
 
   void add(const string& name, const version_t version) {
     ClassInfo library;
@@ -124,7 +124,7 @@ struct ClassList {
     ::decode(library_map, bl);
   }
 };
-WRITE_CLASS_ENCODER(ClassList)
+WRITE_CLASS_ENCODER(ClassLibrary)
 
 inline ostream& operator<<(ostream& out, const ClassInfo& e)
 {

diff --git a/src/mon/ClassMonitor.h b/src/mon/ClassMonitor.h
index cdf6c0a52a522403623fac48f3ad01f1aab0eaab..ad43714c7adefc65420135d22efab6506c238e65 100644 (file)
--- a/src/mon/ClassMonitor.h
+++ b/src/mon/ClassMonitor.h
@@ -32,7 +32,7 @@ class MClass;
 class ClassMonitor : public PaxosService {
 private:
   multimap<utime_t,ClassLibraryIncremental> pending_class;
-  ClassList pending_list, list;
+  ClassLibrary pending_list, list;
 
   void create_initial(bufferlist& bl);
   bool update_from_paxos();