osd: kill pobject_t (use sobject_t throughout)

diff --git a/src/dupstore.cc b/src/dupstore.cc
index bc9d025a8692c06cf5de71706bca302217e7549c..3eb53abfdf8d6cb1b735f1a209f74457422b8e35 100644 (file)
--- a/src/dupstore.cc
+++ b/src/dupstore.cc
@@ -27,7 +27,7 @@ int dupstore(ObjectStore* src, ObjectStore* dst)
   if (dst->mount() < 0) return 1;
 
   // objects
-  hash_map<pobject_t, coll_t> did_object;
+  hash_map<sobject_t, coll_t> did_object;
 
   // collections
   vector<coll_t> collections;
@@ -48,11 +48,11 @@ int dupstore(ObjectStore* src, ObjectStore* dst)
       dst->apply_transaction(t);
     }
 
-    vector<pobject_t> o;
+    vector<sobject_t> o;
     src->collection_list(*p, o);
     int numo = o.size();
     int j = 1;
-    for (vector<pobject_t>::iterator q = o.begin(); q != o.end(); q++) {
+    for (vector<sobject_t>::iterator q = o.begin(); q != o.end(); q++) {
       ObjectStore::Transaction t;
       if (did_object.count(*q))
        t.collection_add(*p, did_object[*q], *q);

diff --git a/src/include/object.h b/src/include/object.h
index 1907be8b5b0caab5facbdd554a5e09790bcc4752..0a3e432514359affcd2ee5f73806c3be7c00a53a 100644 (file)
--- a/src/include/object.h
+++ b/src/include/object.h
@@ -171,8 +171,6 @@ namespace __gnu_cxx {
 
 // ---------------------------
 
-typedef sobject_t pobject_t;
-
 struct coll_t {
   __u64 pgid;
   snapid_t snap;

diff --git a/src/messages/MOSDSubOp.h b/src/messages/MOSDSubOp.h
index 320ae202556ababed6facbd5e15ba42ccd083087..4aec50b8f0d8b5a3371f7bf13f65cc89105709ac 100644 (file)
--- a/src/messages/MOSDSubOp.h
+++ b/src/messages/MOSDSubOp.h
@@ -32,7 +32,7 @@ public:
   
   // subop
   pg_t pgid;
-  pobject_t poid;
+  sobject_t poid;
   
   __u8 acks_wanted;
 
@@ -62,7 +62,7 @@ public:
   map<nstring,bufferptr> attrset;
 
   interval_set<__u64> data_subset;
-  map<pobject_t, interval_set<__u64> > clone_subsets;
+  map<sobject_t, interval_set<__u64> > clone_subsets;
 
  virtual void decode_payload() {
     bufferlist::iterator p = payload.begin();
@@ -118,7 +118,7 @@ public:
   }
 
 
-  MOSDSubOp(osd_reqid_t r, pg_t p, pobject_t po, bool noop_, int aw,
+  MOSDSubOp(osd_reqid_t r, pg_t p, sobject_t po, bool noop_, int aw,
            epoch_t mape, tid_t rtid, eversion_t v) :
     Message(MSG_OSD_SUBOP),
     map_epoch(mape),

diff --git a/src/messages/MOSDSubOpReply.h b/src/messages/MOSDSubOpReply.h
index d4a20383946b46e595e678b206e38fb5d4fe22e5..e05d905351539b7ce74ca5e86d0f3ae43581920e 100644 (file)
--- a/src/messages/MOSDSubOpReply.h
+++ b/src/messages/MOSDSubOpReply.h
@@ -37,7 +37,7 @@ public:
   osd_reqid_t reqid;
   pg_t pgid;
   tid_t rep_tid;
-  pobject_t poid;
+  sobject_t poid;
 
   vector<ceph_osd_op> ops;
 
@@ -83,7 +83,7 @@ public:
 
   pg_t get_pg() { return pgid; }
   tid_t get_rep_tid() { return rep_tid; }
-  pobject_t get_poid() { return poid; }
+  sobject_t get_poid() { return poid; }
 
   int get_ack_type() { return ack_type; }
   bool is_ondisk() { return ack_type & CEPH_OSD_FLAG_ONDISK; }

diff --git a/src/os/Fake.h b/src/os/Fake.h
index fbbf7b60dd26de0f8493f4353c2ec9ea85863b98..d47fe226aa6e1c4e6031d40a3856cb51a7692309 100644 (file)
--- a/src/os/Fake.h
+++ b/src/os/Fake.h
@@ -28,7 +28,7 @@ class FakeCollections {
  private:
   Mutex faker_lock;
   ObjectStore *store;
-  hash_map<coll_t, set<pobject_t> > fakecollections;
+  hash_map<coll_t, set<sobject_t> > fakecollections;
 
  public:
   FakeCollections(ObjectStore *s) : faker_lock("FakeCollections::faker_lock"), store(s) {}
@@ -37,7 +37,7 @@ class FakeCollections {
   int list_collections(vector<coll_t>& ls) {
     faker_lock.Lock();
     int r = 0;
-    for (hash_map< coll_t, set<pobject_t> >::iterator p = fakecollections.begin();
+    for (hash_map< coll_t, set<sobject_t> >::iterator p = fakecollections.begin();
          p != fakecollections.end();
          p++) {
       r++;
@@ -81,7 +81,7 @@ class FakeCollections {
     return r;
   }
 
-  int collection_add(coll_t c, pobject_t o,
+  int collection_add(coll_t c, sobject_t o,
                      Context *onsafe=0) {
     faker_lock.Lock();
     fakecollections[c].insert(o);
@@ -90,7 +90,7 @@ class FakeCollections {
     return 0;
   }
 
-  int collection_remove(coll_t c, pobject_t o,
+  int collection_remove(coll_t c, sobject_t o,
                         Context *onsafe=0) {
     faker_lock.Lock();
     fakecollections[c].erase(o);
@@ -104,10 +104,10 @@ class FakeCollections {
     return fakecollections[c].empty();
   }
 
-  int collection_list(coll_t c, vector<pobject_t>& o) {
+  int collection_list(coll_t c, vector<sobject_t>& o) {
     faker_lock.Lock();
     int r = 0;
-    for (set<pobject_t>::iterator p = fakecollections[c].begin();
+    for (set<sobject_t>::iterator p = fakecollections[c].begin();
          p != fakecollections[c].end();
          p++) {
       o.push_back(*p);
@@ -185,13 +185,13 @@ class FakeAttrs {
 
   Mutex faker_lock;
   ObjectStore *store;
-  hash_map<pobject_t, FakeAttrSet> fakeoattrs;
+  hash_map<sobject_t, FakeAttrSet> fakeoattrs;
   hash_map<coll_t, FakeAttrSet> fakecattrs;
 
  public:
   FakeAttrs(ObjectStore *s) : faker_lock("FakeAttrs::faker_lock"), store(s) {}
 
-  int setattr(coll_t cid, pobject_t oid, const char *name,
+  int setattr(coll_t cid, sobject_t oid, const char *name,
               const void *value, size_t size,
               Context *onsafe=0) {
     faker_lock.Lock();
@@ -200,32 +200,32 @@ class FakeAttrs {
     faker_lock.Unlock();
     return r;
   }
-  int setattrs(coll_t cid, pobject_t oid, map<nstring,bufferptr>& aset) {
+  int setattrs(coll_t cid, sobject_t oid, map<nstring,bufferptr>& aset) {
     faker_lock.Lock();
     int r = fakeoattrs[oid].setattrs(aset);
     faker_lock.Unlock();
     return r;
   }
-  int getattr(coll_t cid, pobject_t oid, const char *name,
+  int getattr(coll_t cid, sobject_t oid, const char *name,
               void *value, size_t size) {
     faker_lock.Lock();
     int r = fakeoattrs[oid].getattr(name, value, size);
     faker_lock.Unlock();
     return r;
   }
-  int getattr(coll_t cid, pobject_t oid, const char *name, bufferptr& bp) {
+  int getattr(coll_t cid, sobject_t oid, const char *name, bufferptr& bp) {
     faker_lock.Lock();
     int r = fakeoattrs[oid].getattr(name, bp);
     faker_lock.Unlock();
     return r;
   }
-  int getattrs(coll_t cid, pobject_t oid, map<nstring,bufferptr>& aset) {
+  int getattrs(coll_t cid, sobject_t oid, map<nstring,bufferptr>& aset) {
     faker_lock.Lock();
     int r = fakeoattrs[oid].getattrs(aset);
     faker_lock.Unlock();
     return r;
   }
-  int rmattr(coll_t cid, pobject_t oid, const char *name,
+  int rmattr(coll_t cid, sobject_t oid, const char *name,
              Context *onsafe=0) {
     faker_lock.Lock();
     int r = fakeoattrs[oid].rmattr(name);
@@ -234,7 +234,7 @@ class FakeAttrs {
     return r;
   }
 
-  int listattr(coll_t cid, pobject_t oid, char *attrs, size_t size) {
+  int listattr(coll_t cid, sobject_t oid, char *attrs, size_t size) {
     faker_lock.Lock();
     int r = fakeoattrs[oid].listattr(attrs,size);
     faker_lock.Unlock();

diff --git a/src/os/FileStore.cc b/src/os/FileStore.cc
index cbbee28e469d8c02bbc203f2b9891b38b36e37b5..976f87bf336fd3f2d8666db3ed16045d8a492731 100644 (file)
--- a/src/os/FileStore.cc
+++ b/src/os/FileStore.cc
@@ -167,14 +167,14 @@ int FileStore::statfs(struct statfs *buf)
 
 
 /* 
- * sorry, these are sentitive to the pobject_t and coll_t typing.
+ * sorry, these are sentitive to the sobject_t and coll_t typing.
  */ 
 
   //           11111111112222222222333333333344444444445555555555
   // 012345678901234567890123456789012345678901234567890123456789
   // yyyyyyyyyyyyyyyy.zzzzzzzz.a_s
 
-void FileStore::append_oname(const pobject_t &oid, char *s)
+void FileStore::append_oname(const sobject_t &oid, char *s)
 {
   //assert(sizeof(oid) == 28);
   char *t = s + strlen(s);
@@ -182,7 +182,7 @@ void FileStore::append_oname(const pobject_t &oid, char *s)
   //parse_object(t+1);
 }
 
-bool FileStore::parse_object(char *s, pobject_t& o)
+bool FileStore::parse_object(char *s, sobject_t& o)
 {
   char *bar = s + strlen(s) - 1;
   while (*bar != '_' &&
@@ -221,7 +221,7 @@ void FileStore::get_cdir(coll_t cid, char *s)
 #endif
 }
 
-void FileStore::get_coname(coll_t cid, const pobject_t& oid, char *s) 
+void FileStore::get_coname(coll_t cid, const sobject_t& oid, char *s) 
 {
   get_cdir(cid, s);
   append_oname(oid, s);
@@ -701,16 +701,16 @@ unsigned FileStore::_apply_transaction(Transaction& t)
       
     case Transaction::OP_CLONE:
       {
-       const pobject_t& oid = t.get_oid();
-       const pobject_t& noid = t.get_oid();
+       const sobject_t& oid = t.get_oid();
+       const sobject_t& noid = t.get_oid();
        _clone(t.get_cid(), oid, noid);
       }
       break;
 
     case Transaction::OP_CLONERANGE:
       {
-       const pobject_t& oid = t.get_oid();
-       const pobject_t& noid = t.get_oid();
+       const sobject_t& oid = t.get_oid();
+       const sobject_t& noid = t.get_oid();
        __u64 off = t.get_length();
        __u64 len = t.get_length();
        _clone_range(t.get_cid(), oid, noid, off, len);
@@ -810,7 +810,7 @@ unsigned FileStore::apply_transaction(Transaction &t, Context *onsafe)
       {
        coll_t cid;
        t.get_cid(cid);
-       pobject_t oid;
+       sobject_t oid;
        t.get_oid(oid);
        __u64 offset, len;
        t.get_length(offset);
@@ -858,7 +858,7 @@ unsigned FileStore::apply_transaction(Transaction &t, Context *onsafe)
       {
        coll_t cid;
        t.get_cid(cid);
-       pobject_t oid;
+       sobject_t oid;
        t.get_oid(oid);
        __u64 offset, len;
        t.get_length(offset);
@@ -871,7 +871,7 @@ unsigned FileStore::apply_transaction(Transaction &t, Context *onsafe)
       {
        coll_t cid;
        t.get_cid(cid);
-       pobject_t oid;
+       sobject_t oid;
        t.get_oid(oid);
        __u64 len;
        t.get_length(len);
@@ -892,7 +892,7 @@ unsigned FileStore::apply_transaction(Transaction &t, Context *onsafe)
       {
        coll_t cid;
        t.get_cid(cid);
-       pobject_t oid;
+       sobject_t oid;
        t.get_oid(oid);
        //remove(cid, oid, 0);
        
@@ -910,7 +910,7 @@ unsigned FileStore::apply_transaction(Transaction &t, Context *onsafe)
       {
        coll_t cid;
        t.get_cid(cid);
-       pobject_t oid;
+       sobject_t oid;
        t.get_oid(oid);
        const char *attrname;
        t.get_attrname(attrname);
@@ -945,7 +945,7 @@ unsigned FileStore::apply_transaction(Transaction &t, Context *onsafe)
        if (op == Transaction::OP_SETATTRS) {
          coll_t cid;
          t.get_cid(cid);
-         pobject_t oid;
+         sobject_t oid;
          t.get_oid(oid);
          getattrs(cid, oid, oldattrs);
          get_coname(cid, oid, fn);
@@ -990,7 +990,7 @@ unsigned FileStore::apply_transaction(Transaction &t, Context *onsafe)
       {
        coll_t cid;
        t.get_cid(cid);
-       pobject_t oid;
+       sobject_t oid;
        t.get_oid(oid);
        const char *attrname;
        t.get_attrname(attrname);
@@ -1011,9 +1011,9 @@ unsigned FileStore::apply_transaction(Transaction &t, Context *onsafe)
       {
        coll_t cid;
        t.get_cid(cid);
-       pobject_t oid;
+       sobject_t oid;
        t.get_oid(oid);
-       pobject_t noid;
+       sobject_t noid;
        t.get_oid(noid);
        clone(cid, oid, noid);
        
@@ -1083,7 +1083,7 @@ unsigned FileStore::apply_transaction(Transaction &t, Context *onsafe)
        coll_t cid, ocid;
        t.get_cid(cid);
        t.get_cid(ocid);
-       pobject_t oid;
+       sobject_t oid;
        t.get_oid(oid);
        collection_add(cid, ocid, oid, 0);
        assert(0);
@@ -1094,7 +1094,7 @@ unsigned FileStore::apply_transaction(Transaction &t, Context *onsafe)
       {
        coll_t cid;
        t.get_cid(cid);
-       pobject_t oid;
+       sobject_t oid;
        t.get_oid(oid);
        collection_remove(cid, oid, 0);
        assert(0);
@@ -1187,7 +1187,7 @@ unsigned FileStore::apply_transaction(Transaction &t, Context *onsafe)
 // --------------------
 // objects
 
-bool FileStore::exists(coll_t cid, const pobject_t& oid)
+bool FileStore::exists(coll_t cid, const sobject_t& oid)
 {
   struct stat st;
   if (stat(cid, oid, &st) == 0)
@@ -1196,7 +1196,7 @@ bool FileStore::exists(coll_t cid, const pobject_t& oid)
     return false;
 }
   
-int FileStore::stat(coll_t cid, const pobject_t& oid, struct stat *st)
+int FileStore::stat(coll_t cid, const sobject_t& oid, struct stat *st)
 {
   char fn[PATH_MAX];
   get_coname(cid, oid, fn);
@@ -1205,7 +1205,7 @@ int FileStore::stat(coll_t cid, const pobject_t& oid, struct stat *st)
   return r < 0 ? -errno:r;
 }
 
-int FileStore::read(coll_t cid, const pobject_t& oid, 
+int FileStore::read(coll_t cid, const sobject_t& oid, 
                     __u64 offset, size_t len,
                     bufferlist& bl) {
   char fn[PATH_MAX];
@@ -1243,7 +1243,7 @@ int FileStore::read(coll_t cid, const pobject_t& oid,
 
 
 
-int FileStore::_remove(coll_t cid, const pobject_t& oid) 
+int FileStore::_remove(coll_t cid, const sobject_t& oid) 
 {
   char fn[PATH_MAX];
   get_coname(cid, oid, fn);
@@ -1254,7 +1254,7 @@ int FileStore::_remove(coll_t cid, const pobject_t& oid)
   return r;
 }
 
-int FileStore::_truncate(coll_t cid, const pobject_t& oid, __u64 size)
+int FileStore::_truncate(coll_t cid, const sobject_t& oid, __u64 size)
 {
   char fn[PATH_MAX];
   get_coname(cid, oid, fn);
@@ -1266,7 +1266,7 @@ int FileStore::_truncate(coll_t cid, const pobject_t& oid, __u64 size)
 }
 
 
-int FileStore::_touch(coll_t cid, const pobject_t& oid)
+int FileStore::_touch(coll_t cid, const sobject_t& oid)
 {
   char fn[PATH_MAX];
   get_coname(cid, oid, fn);
@@ -1285,7 +1285,7 @@ int FileStore::_touch(coll_t cid, const pobject_t& oid)
   return r;
 }
 
-int FileStore::_write(coll_t cid, const pobject_t& oid, 
+int FileStore::_write(coll_t cid, const sobject_t& oid, 
                      __u64 offset, size_t len,
                      const bufferlist& bl)
 {
@@ -1331,7 +1331,7 @@ int FileStore::_write(coll_t cid, const pobject_t& oid,
   return r;
 }
 
-int FileStore::_zero(coll_t cid, const pobject_t& oid, __u64 offset, size_t len)
+int FileStore::_zero(coll_t cid, const sobject_t& oid, __u64 offset, size_t len)
 {
   // write zeros.. yuck!
   bufferptr bp(len);
@@ -1340,7 +1340,7 @@ int FileStore::_zero(coll_t cid, const pobject_t& oid, __u64 offset, size_t len)
   return _write(cid, oid, offset, len, bl);
 }
 
-int FileStore::_clone(coll_t cid, const pobject_t& oldoid, const pobject_t& newoid)
+int FileStore::_clone(coll_t cid, const sobject_t& oldoid, const sobject_t& newoid)
 {
   char ofn[PATH_MAX], nfn[PATH_MAX];
   get_coname(cid, oldoid, ofn);
@@ -1422,7 +1422,7 @@ int FileStore::_do_clone_range(int from, int to, __u64 off, __u64 len)
   return r;
 }
 
-int FileStore::_clone_range(coll_t cid, const pobject_t& oldoid, const pobject_t& newoid, __u64 off, __u64 len)
+int FileStore::_clone_range(coll_t cid, const sobject_t& oldoid, const sobject_t& newoid, __u64 off, __u64 len)
 {
   char ofn[PATH_MAX], nfn[PATH_MAX];
   get_coname(cid, oldoid, ofn);
@@ -1593,7 +1593,7 @@ int FileStore::_getattrs(const char *fn, map<nstring,bufferptr>& aset)
 
 // objects
 
-int FileStore::getattr(coll_t cid, const pobject_t& oid, const char *name,
+int FileStore::getattr(coll_t cid, const sobject_t& oid, const char *name,
                       void *value, size_t size) 
 {
   if (fake_attrs) return attrs.getattr(cid, oid, name, value, size);
@@ -1608,7 +1608,7 @@ int FileStore::getattr(coll_t cid, const pobject_t& oid, const char *name,
   return r;
 }
 
-int FileStore::getattr(coll_t cid, const pobject_t& oid, const char *name, bufferptr &bp)
+int FileStore::getattr(coll_t cid, const sobject_t& oid, const char *name, bufferptr &bp)
 {
   if (fake_attrs) return attrs.getattr(cid, oid, name, bp);
 
@@ -1622,7 +1622,7 @@ int FileStore::getattr(coll_t cid, const pobject_t& oid, const char *name, buffe
   return r;
 }
 
-int FileStore::getattrs(coll_t cid, const pobject_t& oid, map<nstring,bufferptr>& aset) 
+int FileStore::getattrs(coll_t cid, const sobject_t& oid, map<nstring,bufferptr>& aset) 
 {
   if (fake_attrs) return attrs.getattrs(cid, oid, aset);
 
@@ -1638,7 +1638,7 @@ int FileStore::getattrs(coll_t cid, const pobject_t& oid, map<nstring,bufferptr>
 
 
 
-int FileStore::_setattr(coll_t cid, const pobject_t& oid, const char *name,
+int FileStore::_setattr(coll_t cid, const sobject_t& oid, const char *name,
                        const void *value, size_t size) 
 {
   if (fake_attrs) return attrs.setattr(cid, oid, name, value, size);
@@ -1653,7 +1653,7 @@ int FileStore::_setattr(coll_t cid, const pobject_t& oid, const char *name,
   return r;
 }
 
-int FileStore::_setattrs(coll_t cid, const pobject_t& oid, map<nstring,bufferptr>& aset) 
+int FileStore::_setattrs(coll_t cid, const sobject_t& oid, map<nstring,bufferptr>& aset) 
 {
   if (fake_attrs) return attrs.setattrs(cid, oid, aset);
 
@@ -1682,7 +1682,7 @@ int FileStore::_setattrs(coll_t cid, const pobject_t& oid, map<nstring,bufferptr
 }
 
 
-int FileStore::_rmattr(coll_t cid, const pobject_t& oid, const char *name) 
+int FileStore::_rmattr(coll_t cid, const sobject_t& oid, const char *name) 
 {
   if (fake_attrs) return attrs.rmattr(cid, oid, name);
 
@@ -1863,7 +1863,7 @@ bool FileStore::collection_empty(coll_t c)
     // parse
     if (de->d_name[0] == '.') continue;
     //cout << "  got object " << de->d_name << std::endl;
-    pobject_t o;
+    sobject_t o;
     if (parse_object(de->d_name, o)) {
       empty = false;
       break;
@@ -1875,7 +1875,7 @@ bool FileStore::collection_empty(coll_t c)
   return empty;
 }
 
-int FileStore::collection_list_partial(coll_t c, vector<pobject_t>& ls, int max_count, collection_list_handle_t *handle) 
+int FileStore::collection_list_partial(coll_t c, vector<sobject_t>& ls, int max_count, collection_list_handle_t *handle) 
 {  
   if (fake_collections) return collections.collection_list(c, ls);
 
@@ -1888,7 +1888,7 @@ int FileStore::collection_list_partial(coll_t c, vector<pobject_t>& ls, int max_
     return -errno;
   
   // first, build (ino, object) list
-  vector< pair<ino_t,pobject_t> > inolist;
+  vector< pair<ino_t,sobject_t> > inolist;
 
   struct dirent *de;
   if (handle)
@@ -1905,9 +1905,9 @@ int FileStore::collection_list_partial(coll_t c, vector<pobject_t>& ls, int max_
     // parse
     if (de->d_name[0] == '.') continue;
     //cout << "  got object " << de->d_name << std::endl;
-    pobject_t o;
+    sobject_t o;
     if (parse_object(de->d_name, o)) {
-      inolist.push_back(pair<ino_t,pobject_t>(de->d_ino, o));
+      inolist.push_back(pair<ino_t,sobject_t>(de->d_ino, o));
       ls.push_back(o);
     }
   }
@@ -1921,7 +1921,7 @@ int FileStore::collection_list_partial(coll_t c, vector<pobject_t>& ls, int max_
   // build final list
   ls.resize(inolist.size());
   int i = 0;
-  for (vector< pair<ino_t,pobject_t> >::iterator p = inolist.begin(); p != inolist.end(); p++)
+  for (vector< pair<ino_t,sobject_t> >::iterator p = inolist.begin(); p != inolist.end(); p++)
     ls[i++] = p->second;
   
   dout(10) << "collection_list " << fn << " = 0 (" << ls.size() << " objects)" << dendl;
@@ -1929,7 +1929,7 @@ int FileStore::collection_list_partial(coll_t c, vector<pobject_t>& ls, int max_
 }
 
 
-int FileStore::collection_list(coll_t c, vector<pobject_t>& ls) 
+int FileStore::collection_list(coll_t c, vector<sobject_t>& ls) 
 {  
   if (fake_collections) return collections.collection_list(c, ls);
 
@@ -1942,16 +1942,16 @@ int FileStore::collection_list(coll_t c, vector<pobject_t>& ls)
     return -errno;
   
   // first, build (ino, object) list
-  vector< pair<ino_t,pobject_t> > inolist;
+  vector< pair<ino_t,sobject_t> > inolist;
 
   struct dirent *de;
   while ((de = ::readdir(dir)) != 0) {
     // parse
     if (de->d_name[0] == '.') continue;
     //cout << "  got object " << de->d_name << std::endl;
-    pobject_t o;
+    sobject_t o;
     if (parse_object(de->d_name, o)) {
-      inolist.push_back(pair<ino_t,pobject_t>(de->d_ino, o));
+      inolist.push_back(pair<ino_t,sobject_t>(de->d_ino, o));
       ls.push_back(o);
     }
   }
@@ -1963,7 +1963,7 @@ int FileStore::collection_list(coll_t c, vector<pobject_t>& ls)
   // build final list
   ls.resize(inolist.size());
   int i = 0;
-  for (vector< pair<ino_t,pobject_t> >::iterator p = inolist.begin(); p != inolist.end(); p++)
+  for (vector< pair<ino_t,sobject_t> >::iterator p = inolist.begin(); p != inolist.end(); p++)
     ls[i++] = p->second;
   
   dout(10) << "collection_list " << fn << " = 0 (" << ls.size() << " objects)" << dendl;
@@ -2002,7 +2002,7 @@ int FileStore::_destroy_collection(coll_t c)
 }
 
 
-int FileStore::_collection_add(coll_t c, coll_t cid, const pobject_t& o) 
+int FileStore::_collection_add(coll_t c, coll_t cid, const sobject_t& o) 
 {
   if (fake_collections) return collections.collection_add(c, o);
 
@@ -2017,7 +2017,7 @@ int FileStore::_collection_add(coll_t c, coll_t cid, const pobject_t& o)
   return r;
 }
 
-int FileStore::_collection_remove(coll_t c, const pobject_t& o) 
+int FileStore::_collection_remove(coll_t c, const sobject_t& o) 
 {
   if (fake_collections) return collections.collection_remove(c, o);
 

diff --git a/src/os/FileStore.h b/src/os/FileStore.h
index 1cce31b268c59da91d77a868bd686b4b5db5c683..6c07af37a966bdce459a53cf2243f24a6a1e2253 100644 (file)
--- a/src/os/FileStore.h
+++ b/src/os/FileStore.h
@@ -50,11 +50,11 @@ class FileStore : public JournalingObjectStore {
   bool fake_collections;
   
   // helper fns
-  void append_oname(const pobject_t &oid, char *s);
-  //void get_oname(pobject_t oid, char *s);
+  void append_oname(const sobject_t &oid, char *s);
+  //void get_oname(sobject_t oid, char *s);
   void get_cdir(coll_t cid, char *s);
-  void get_coname(coll_t cid, const pobject_t& oid, char *s);
-  bool parse_object(char *s, pobject_t& o);
+  void get_coname(coll_t cid, const sobject_t& oid, char *s);
+  bool parse_object(char *s, sobject_t& o);
   bool parse_coll(char *s, coll_t& c);
   
   int lock_fsid();
@@ -101,21 +101,21 @@ class FileStore : public JournalingObjectStore {
 
   // ------------------
   // objects
-  int pick_object_revision_lt(pobject_t& oid) {
+  int pick_object_revision_lt(sobject_t& oid) {
     return 0;
   }
-  bool exists(coll_t cid, const pobject_t& oid);
-  int stat(coll_t cid, const pobject_t& oid, struct stat *st);
-  int read(coll_t cid, const pobject_t& oid, __u64 offset, size_t len, bufferlist& bl);
-
-  int _touch(coll_t cid, const pobject_t& oid);
-  int _write(coll_t cid, const pobject_t& oid, __u64 offset, size_t len, const bufferlist& bl);
-  int _zero(coll_t cid, const pobject_t& oid, __u64 offset, size_t len);
-  int _truncate(coll_t cid, const pobject_t& oid, __u64 size);
-  int _clone(coll_t cid, const pobject_t& oldoid, const pobject_t& newoid);
-  int _clone_range(coll_t cid, const pobject_t& oldoid, const pobject_t& newoid, __u64 off, __u64 len);
+  bool exists(coll_t cid, const sobject_t& oid);
+  int stat(coll_t cid, const sobject_t& oid, struct stat *st);
+  int read(coll_t cid, const sobject_t& oid, __u64 offset, size_t len, bufferlist& bl);
+
+  int _touch(coll_t cid, const sobject_t& oid);
+  int _write(coll_t cid, const sobject_t& oid, __u64 offset, size_t len, const bufferlist& bl);
+  int _zero(coll_t cid, const sobject_t& oid, __u64 offset, size_t len);
+  int _truncate(coll_t cid, const sobject_t& oid, __u64 size);
+  int _clone(coll_t cid, const sobject_t& oldoid, const sobject_t& newoid);
+  int _clone_range(coll_t cid, const sobject_t& oldoid, const sobject_t& newoid, __u64 off, __u64 len);
   int _do_clone_range(int from, int to, __u64 off, __u64 len);
-  int _remove(coll_t cid, const pobject_t& oid);
+  int _remove(coll_t cid, const sobject_t& oid);
 
   void _start_sync();
 
@@ -123,16 +123,16 @@ class FileStore : public JournalingObjectStore {
   void sync(Context *onsafe);
 
   // attrs
-  int getattr(coll_t cid, const pobject_t& oid, const char *name, void *value, size_t size);
-  int getattr(coll_t cid, const pobject_t& oid, const char *name, bufferptr &bp);
-  int getattrs(coll_t cid, const pobject_t& oid, map<nstring,bufferptr>& aset);
+  int getattr(coll_t cid, const sobject_t& oid, const char *name, void *value, size_t size);
+  int getattr(coll_t cid, const sobject_t& oid, const char *name, bufferptr &bp);
+  int getattrs(coll_t cid, const sobject_t& oid, map<nstring,bufferptr>& aset);
 
   int _getattr(const char *fn, const char *name, bufferptr& bp);
   int _getattrs(const char *fn, map<nstring,bufferptr>& aset);
 
-  int _setattr(coll_t cid, const pobject_t& oid, const char *name, const void *value, size_t size);
-  int _setattrs(coll_t cid, const pobject_t& oid, map<nstring,bufferptr>& aset);
-  int _rmattr(coll_t cid, const pobject_t& oid, const char *name);
+  int _setattr(coll_t cid, const sobject_t& oid, const char *name, const void *value, size_t size);
+  int _setattrs(coll_t cid, const sobject_t& oid, map<nstring,bufferptr>& aset);
+  int _rmattr(coll_t cid, const sobject_t& oid, const char *name);
 
   int collection_getattr(coll_t c, const char *name, void *value, size_t size);
   int collection_getattr(coll_t c, const char *name, bufferlist& bl);
@@ -147,16 +147,16 @@ class FileStore : public JournalingObjectStore {
   int collection_stat(coll_t c, struct stat *st);
   bool collection_exists(coll_t c);
   bool collection_empty(coll_t c);
-  int collection_list_partial(coll_t c, vector<pobject_t>& o, int count, collection_list_handle_t *handle);
-  int collection_list(coll_t c, vector<pobject_t>& o);
+  int collection_list_partial(coll_t c, vector<sobject_t>& o, int count, collection_list_handle_t *handle);
+  int collection_list(coll_t c, vector<sobject_t>& o);
 
   int _create_collection(coll_t c);
   int _destroy_collection(coll_t c);
-  int _collection_add(coll_t c, coll_t ocid, const pobject_t& o);
-  int _collection_remove(coll_t c, const pobject_t& o);
+  int _collection_add(coll_t c, coll_t ocid, const sobject_t& o);
+  int _collection_remove(coll_t c, const sobject_t& o);
 
-  void trim_from_cache(coll_t cid, const pobject_t& oid, __u64 offset, size_t len) {}
-  int is_cached(coll_t cid, const pobject_t& oid, __u64 offset, size_t len) { return -1; }
+  void trim_from_cache(coll_t cid, const sobject_t& oid, __u64 offset, size_t len) {}
+  int is_cached(coll_t cid, const sobject_t& oid, __u64 offset, size_t len) { return -1; }
 };
 
 #endif

diff --git a/src/os/ObjectStore.h b/src/os/ObjectStore.h
index 134164006a1ce1e9e10a772b517d9038d2ec24c4..ccc2abb36d4f3ca0ccae440943ff562ce5a7d1f4 100644 (file)
--- a/src/os/ObjectStore.h
+++ b/src/os/ObjectStore.h
@@ -109,7 +109,7 @@ public:
     */
     vector<int8_t> ops;
     vector<bufferlist> bls;
-    vector<pobject_t> oids;
+    vector<sobject_t> oids;
     vector<coll_t> cids;
     vector<int64_t> lengths;
 
@@ -153,7 +153,7 @@ public:
     bufferlist &get_bl() {
       return bls[blp++];
     }
-    pobject_t get_oid() {
+    sobject_t get_oid() {
       return oids[oidp++];
     }
     coll_t get_cid() {
@@ -173,7 +173,7 @@ public:
       int op = OP_STARTSYNC;
       ops.push_back(op);
     }
-    void touch(coll_t cid, const pobject_t& oid) {
+    void touch(coll_t cid, const sobject_t& oid) {
       int op = OP_TOUCH;
       ops.push_back(op);
       cids.push_back(cid);
@@ -181,7 +181,7 @@ public:
       //len++;
       //blen += 3;
     }
-    void write(coll_t cid, const pobject_t& oid, __u64 off, size_t len, const bufferlist& bl) {
+    void write(coll_t cid, const sobject_t& oid, __u64 off, size_t len, const bufferlist& bl) {
       int op = OP_WRITE;
       ops.push_back(op);
       cids.push_back(cid);
@@ -192,7 +192,7 @@ public:
       //len++;
       //blen += 3 + bl.buffers().size();
     }
-    void zero(coll_t cid, const pobject_t& oid, __u64 off, size_t len) {
+    void zero(coll_t cid, const sobject_t& oid, __u64 off, size_t len) {
       int op = OP_ZERO;
       ops.push_back(op);
       cids.push_back(cid);
@@ -202,7 +202,7 @@ public:
       //len++;
       //blen += 3 + 1;
     }
-    void trim_from_cache(coll_t cid, const pobject_t& oid, __u64 off, size_t len) {
+    void trim_from_cache(coll_t cid, const sobject_t& oid, __u64 off, size_t len) {
       int op = OP_TRIMCACHE;
       ops.push_back(op);
       cids.push_back(cid);
@@ -211,7 +211,7 @@ public:
       lengths.push_back(len);
       //len++;
     }
-    void truncate(coll_t cid, const pobject_t& oid, __u64 off) {
+    void truncate(coll_t cid, const sobject_t& oid, __u64 off) {
       int op = OP_TRUNCATE;
       ops.push_back(op);
       cids.push_back(cid);
@@ -220,7 +220,7 @@ public:
       //len++;
       //blen++;
     }
-    void remove(coll_t cid, const pobject_t& oid) {
+    void remove(coll_t cid, const sobject_t& oid) {
       int op = OP_REMOVE;
       ops.push_back(op);
       cids.push_back(cid);
@@ -228,17 +228,17 @@ public:
       //len++;
       //blen++;
     }
-    void setattr(coll_t cid, const pobject_t& oid, const char* name, const void* val, int len) {
+    void setattr(coll_t cid, const sobject_t& oid, const char* name, const void* val, int len) {
       bufferlist bl;
       bl.append((char*)val, len);
       setattr(cid, oid, name, bl);
     }
-    void setattr(coll_t cid, const pobject_t& oid, nstring& s, bufferlist& val) {
+    void setattr(coll_t cid, const sobject_t& oid, nstring& s, bufferlist& val) {
       attrnames2.push_back(nstring());
       attrnames2.back().swap(s);
       setattr(cid, oid, attrnames2.back().c_str(), val);
     }
-    void setattr(coll_t cid, const pobject_t& oid, const char* name, bufferlist& val) {
+    void setattr(coll_t cid, const sobject_t& oid, const char* name, bufferlist& val) {
       int op = OP_SETATTR;
       ops.push_back(op);
       cids.push_back(cid);
@@ -248,7 +248,7 @@ public:
       //len++;
       //blen++;
     }
-    void setattrs(coll_t cid, const pobject_t& oid, map<nstring,bufferptr>& attrset) {
+    void setattrs(coll_t cid, const sobject_t& oid, map<nstring,bufferptr>& attrset) {
       map<nstring,bufferptr> empty;
       int op = OP_SETATTRS;
       ops.push_back(op);
@@ -259,12 +259,12 @@ public:
       //len++;
       //blen += 5 + attrset.size();     // HACK allowance for removing old attrs
     }
-    void rmattr(coll_t cid, const pobject_t& oid, nstring& s) {
+    void rmattr(coll_t cid, const sobject_t& oid, nstring& s) {
       attrnames2.push_back(nstring());
       attrnames2.back().swap(s);
       rmattr(cid, oid, attrnames2.back().c_str());
     }
-    void rmattr(coll_t cid, const pobject_t& oid, const char* name) {
+    void rmattr(coll_t cid, const sobject_t& oid, const char* name) {
       int op = OP_RMATTR;
       ops.push_back(op);
       cids.push_back(cid);
@@ -273,7 +273,7 @@ public:
       //len++;
       //blen++;
     }
-    void clone(coll_t cid, const pobject_t& oid, pobject_t noid) {
+    void clone(coll_t cid, const sobject_t& oid, sobject_t noid) {
       int op = OP_CLONE;
       ops.push_back(op);
       cids.push_back(cid);
@@ -282,7 +282,7 @@ public:
       //len++;
       //blen += 5;
     }
-    void clone_range(coll_t cid, const pobject_t& oid, pobject_t noid, __u64 off, __u64 len) {
+    void clone_range(coll_t cid, const sobject_t& oid, sobject_t noid, __u64 off, __u64 len) {
       int op = OP_CLONERANGE;
       ops.push_back(op);
       cids.push_back(cid);
@@ -307,7 +307,7 @@ public:
       //len++;
       //blen++;
     }
-    void collection_add(coll_t cid, coll_t ocid, const pobject_t& oid) {
+    void collection_add(coll_t cid, coll_t ocid, const sobject_t& oid) {
       int op = OP_COLL_ADD;
       ops.push_back(op);
       cids.push_back(cid);
@@ -316,7 +316,7 @@ public:
       //len++;
       //blen++;
     }
-    void collection_remove(coll_t cid, const pobject_t& oid) {
+    void collection_remove(coll_t cid, const sobject_t& oid) {
       int op = OP_COLL_REMOVE;
       ops.push_back(op);
       cids.push_back(cid);
@@ -413,15 +413,15 @@ public:
   virtual int statfs(struct statfs *buf) = 0;
 
   // objects
-  virtual bool exists(coll_t cid, const pobject_t& oid) = 0;                   // useful?
-  virtual int stat(coll_t cid, const pobject_t& oid, struct stat *st) = 0;     // struct stat?
-  virtual int read(coll_t cid, const pobject_t& oid, __u64 offset, size_t len, bufferlist& bl) = 0;
+  virtual bool exists(coll_t cid, const sobject_t& oid) = 0;                   // useful?
+  virtual int stat(coll_t cid, const sobject_t& oid, struct stat *st) = 0;     // struct stat?
+  virtual int read(coll_t cid, const sobject_t& oid, __u64 offset, size_t len, bufferlist& bl) = 0;
 
   /*
-  virtual int _remove(coll_t cid, pobject_t oid) = 0;
-  virtual int _truncate(coll_t cid, pobject_t oid, __u64 size) = 0;
-  virtual int _write(coll_t cid, pobject_t oid, __u64 offset, size_t len, const bufferlist& bl) = 0;
-  virtual int _zero(coll_t cid, pobject_t oid, __u64 offset, size_t len) {
+  virtual int _remove(coll_t cid, sobject_t oid) = 0;
+  virtual int _truncate(coll_t cid, sobject_t oid, __u64 size) = 0;
+  virtual int _write(coll_t cid, sobject_t oid, __u64 offset, size_t len, const bufferlist& bl) = 0;
+  virtual int _zero(coll_t cid, sobject_t oid, __u64 offset, size_t len) {
     // write zeros.. yuck!
     bufferptr bp(len);
     bufferlist bl;
@@ -430,28 +430,28 @@ public:
   }
   */
 
-  virtual void trim_from_cache(coll_t cid, const pobject_t& oid, __u64 offset, size_t len) = 0; //{ }
-  virtual int is_cached(coll_t cid, const pobject_t& oid, __u64 offset, size_t len) = 0;  //{ return -1; }
+  virtual void trim_from_cache(coll_t cid, const sobject_t& oid, __u64 offset, size_t len) = 0; //{ }
+  virtual int is_cached(coll_t cid, const sobject_t& oid, __u64 offset, size_t len) = 0;  //{ return -1; }
 
-  virtual int getattr(coll_t cid, const pobject_t& oid, const char *name, void *value, size_t size) = 0;
-  virtual int getattr(coll_t cid, const pobject_t& oid, const char *name, bufferptr& value) = 0;
-  int getattr(coll_t cid, const pobject_t& oid, const char *name, bufferlist& value) {
+  virtual int getattr(coll_t cid, const sobject_t& oid, const char *name, void *value, size_t size) = 0;
+  virtual int getattr(coll_t cid, const sobject_t& oid, const char *name, bufferptr& value) = 0;
+  int getattr(coll_t cid, const sobject_t& oid, const char *name, bufferlist& value) {
     bufferptr bp;
     int r = getattr(cid, oid, name, bp);
     if (bp.length())
       value.push_back(bp);
     return r;
   }
-  virtual int getattrs(coll_t cid, const pobject_t& oid, map<nstring,bufferptr>& aset) {return 0;};
+  virtual int getattrs(coll_t cid, const sobject_t& oid, map<nstring,bufferptr>& aset) {return 0;};
 
   /*
-  virtual int _setattr(coll_t cid, pobject_t oid, const char *name, const void *value, size_t size) = 0;
-  virtual int _setattr(coll_t cid, pobject_t oid, const char *name, const bufferptr &bp) {
+  virtual int _setattr(coll_t cid, sobject_t oid, const char *name, const void *value, size_t size) = 0;
+  virtual int _setattr(coll_t cid, sobject_t oid, const char *name, const bufferptr &bp) {
     return _setattr(cid, oid, name, bp.c_str(), bp.length());
   }
-  virtual int _setattrs(coll_t cid, pobject_t oid, map<string,bufferptr>& aset) = 0;
-  virtual int _rmattr(coll_t cid, pobject_t oid, const char *name) {return 0;}
-  virtual int _clone(coll_t cid, pobject_t oid, pobject_t noid) {
+  virtual int _setattrs(coll_t cid, sobject_t oid, map<string,bufferptr>& aset) = 0;
+  virtual int _rmattr(coll_t cid, sobject_t oid, const char *name) {return 0;}
+  virtual int _clone(coll_t cid, sobject_t oid, sobject_t noid) {
     return -1;
   }
   */
@@ -464,14 +464,14 @@ public:
   virtual int collection_getattr(coll_t cid, const char *name, bufferlist& bl) = 0;
   virtual int collection_getattrs(coll_t cid, map<nstring,bufferptr> &aset) = 0;
   virtual bool collection_empty(coll_t c) = 0;
-  virtual int collection_list_partial(coll_t c, vector<pobject_t>& o, int count, collection_list_handle_t *handle) = 0;
-  virtual int collection_list(coll_t c, vector<pobject_t>& o) = 0;
+  virtual int collection_list_partial(coll_t c, vector<sobject_t>& o, int count, collection_list_handle_t *handle) = 0;
+  virtual int collection_list(coll_t c, vector<sobject_t>& o) = 0;
 
   /*
   virtual int _create_collection(coll_t c) = 0;
   virtual int _destroy_collection(coll_t c) = 0;
-  virtual int _collection_add(coll_t c, coll_t ocid, pobject_t o) = 0;
-  virtual int _collection_remove(coll_t c, pobject_t o) = 0;
+  virtual int _collection_add(coll_t c, coll_t ocid, sobject_t o) = 0;
+  virtual int _collection_remove(coll_t c, sobject_t o) = 0;
   virtual int _collection_setattr(coll_t cid, const char *name,
                                  const void *value, size_t size) = 0;
   virtual int _collection_rmattr(coll_t cid, const char *name) = 0;

diff --git a/src/osd/Ager.cc b/src/osd/Ager.cc
index 5ba2fdda2397ec1043e61a682bb19085bcac1b43..c52c93b3e1eb342e80f9e71fa329d1d84d027e2c 100644 (file)
--- a/src/osd/Ager.cc
+++ b/src/osd/Ager.cc
@@ -117,7 +117,7 @@ uint64_t Ager::age_fill(float pc, utime_t until) {
       bufferlist sbl;
       sbl.substr_of(bl, 0, t);
       ObjectStore::Transaction tr;
-      pobject_t oid(poid, 0);
+      sobject_t oid(poid, 0);
       tr.write(0, oid, off, t, sbl);
       store->apply_transaction(tr);
       off += t;
@@ -161,7 +161,7 @@ void Ager::age_empty(float pc) {
     generic_dout(2) << "age_empty at " << free << " / " << avail << " / " << pc << " removing " << hex << poid << dec << dendl;
     
     ObjectStore::Transaction t;
-    pobject_t oid(poid, 0);
+    sobject_t oid(poid, 0);
     t.remove(0, oid);
     store->apply_transaction(t);
     age_free_oids.push_back(poid);

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 985afe1a8786643250f7b319cfef3e9e90138b47..d71c7dbe94602637f5e42491d5c7e2e3766c4f9c 100644 (file)
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -158,7 +158,7 @@ int OSD::mkfs(const char *dev, const char *jdev, ceph_fsid_t fsid, int whoami)
     object_t oid("disk_bw_test");
     for (int i=0; i<1000; i++) {
       ObjectStore::Transaction t;
-      t.write(0, pobject_t(oid, 0), i*bl.length(), bl.length(), bl);
+      t.write(0, sobject_t(oid, 0), i*bl.length(), bl.length(), bl);
       store->apply_transaction(t);
     }
     store->sync();
@@ -166,7 +166,7 @@ int OSD::mkfs(const char *dev, const char *jdev, ceph_fsid_t fsid, int whoami)
     end -= start;
     cout << "measured " << (1000.0 / (double)end) << " mb/sec" << std::endl;
     ObjectStore::Transaction tr;
-    tr.remove(0, pobject_t(oid, 0));
+    tr.remove(0, sobject_t(oid, 0));
     store->apply_transaction(tr);
     
     // set osd weight
@@ -657,7 +657,7 @@ void OSD::_remove_unlock_pg(PG *pg)
   backlog_wq.dequeue(pg);
 
   // remove from store
-  vector<pobject_t> olist;
+  vector<sobject_t> olist;
 
   ObjectStore::Transaction t;
   {
@@ -665,10 +665,10 @@ void OSD::_remove_unlock_pg(PG *pg)
     for (set<snapid_t>::iterator p = pg->snap_collections.begin();
         p != pg->snap_collections.end();
         p++) {
-      vector<pobject_t> olist;      
+      vector<sobject_t> olist;      
       store->collection_list(pgid.to_snap_coll(*p), olist);
       dout(10) << "_remove_unlock_pg " << pgid << " snap " << *p << " " << olist.size() << " objects" << dendl;
-      for (vector<pobject_t>::iterator q = olist.begin();
+      for (vector<sobject_t>::iterator q = olist.begin();
           q != olist.end();
           q++)
        t.remove(pgid.to_snap_coll(*p), *q);
@@ -680,7 +680,7 @@ void OSD::_remove_unlock_pg(PG *pg)
     // main collection
     store->collection_list(pgid.to_coll(), olist);
     dout(10) << "_remove_unlock_pg " << pgid << " " << olist.size() << " objects" << dendl;
-    for (vector<pobject_t>::iterator p = olist.begin();
+    for (vector<sobject_t>::iterator p = olist.begin();
         p != olist.end();
         p++)
       t.remove(pgid.to_coll(), *p);
@@ -1765,7 +1765,7 @@ void OSD::handle_osd_map(MOSDMap *m)
   for (map<epoch_t,bufferlist>::iterator p = m->maps.begin();
        p != m->maps.end();
        p++) {
-    pobject_t poid = get_osdmap_pobject_name(p->first);
+    sobject_t poid = get_osdmap_pobject_name(p->first);
     if (store->exists(0, poid)) {
       dout(10) << "handle_osd_map already had full map epoch " << p->first << dendl;
       logger->inc(l_osd_mapfdup);
@@ -1791,7 +1791,7 @@ void OSD::handle_osd_map(MOSDMap *m)
   for (map<epoch_t,bufferlist>::iterator p = m->incremental_maps.begin();
        p != m->incremental_maps.end();
        p++) {
-    pobject_t poid = get_inc_osdmap_pobject_name(p->first);
+    sobject_t poid = get_inc_osdmap_pobject_name(p->first);
     if (store->exists(0, poid)) {
       dout(10) << "handle_osd_map already had incremental map epoch " << p->first << dendl;
       logger->inc(l_osd_mapidup);
@@ -2492,11 +2492,11 @@ void OSD::split_pg(PG *parent, map<pg_t,PG*>& children, ObjectStore::Transaction
   dout(10) << "split_pg " << *parent << dendl;
   pg_t parentid = parent->info.pgid;
 
-  vector<pobject_t> olist;
+  vector<sobject_t> olist;
   store->collection_list(parent->info.pgid.to_coll(), olist);  
 
-  for (vector<pobject_t>::iterator p = olist.begin(); p != olist.end(); p++) {
-    pobject_t poid = *p;
+  for (vector<sobject_t>::iterator p = olist.begin(); p != olist.end(); p++) {
+    sobject_t poid = *p;
     ceph_object_layout l = osdmap->make_object_layout(poid.oid, parentid.pool(), parentid.preferred());
     pg_t pgid = osdmap->raw_pg_to_pg(pg_t(le64_to_cpu(l.ol_pgid)));
     if (pgid != parentid) {

diff --git a/src/osd/OSD.h b/src/osd/OSD.h
index 6adf08ff50463171fa18ff8388a06c2c36b5696d..9a04a3da4b2000e6d90bf003561c0034ec5eb913 100644 (file)
--- a/src/osd/OSD.h
+++ b/src/osd/OSD.h
@@ -122,15 +122,15 @@ public:
   ClassHandler  *class_handler;
   int get_nodeid() { return whoami; }
   
-  static pobject_t get_osdmap_pobject_name(epoch_t epoch) { 
+  static sobject_t get_osdmap_pobject_name(epoch_t epoch) { 
     char foo[20];
     sprintf(foo, "osdmap.%d", epoch);
-    return pobject_t(object_t(foo), 0); 
+    return sobject_t(object_t(foo), 0); 
   }
-  static pobject_t get_inc_osdmap_pobject_name(epoch_t epoch) { 
+  static sobject_t get_inc_osdmap_pobject_name(epoch_t epoch) { 
     char foo[20];
     sprintf(foo, "inc_osdmap.%d", epoch);
-    return pobject_t(object_t(foo), 0); 
+    return sobject_t(object_t(foo), 0); 
   }
   
 

diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index 826b10f1a55c6246a2c6d5dd8c14cf43c7f7a110..e84d507ee1f9e74f1a3371aa81f07025450bdd8e 100644 (file)
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -535,13 +535,13 @@ bool PG::build_backlog_map(map<eversion_t,Log::Entry>& omap)
 
   unlock();
 
-  vector<pobject_t> olist;
+  vector<sobject_t> olist;
   osd->store->collection_list(info.pgid.to_coll(), olist);
 
-  for (vector<pobject_t>::iterator it = olist.begin();
+  for (vector<sobject_t>::iterator it = olist.begin();
        it != olist.end();
        it++) {
-    pobject_t poid = *it;
+    sobject_t poid = *it;
 
     Log::Entry e;
     e.soid = poid;
@@ -1967,15 +1967,15 @@ void PG::build_scrub_map(ScrubMap &map)
   coll_t c = info.pgid.to_coll();
 
   // objects
-  vector<pobject_t> ls;
+  vector<sobject_t> ls;
   osd->store->collection_list(c, ls);
 
   // sort
   dout(10) << "sorting " << ls.size() << " objects" << dendl;
-  vector< pair<pobject_t,int> > tab(ls.size());
-  vector< pair<pobject_t,int> >::iterator q = tab.begin();
+  vector< pair<sobject_t,int> > tab(ls.size());
+  vector< pair<sobject_t,int> >::iterator q = tab.begin();
   int i = 0;
-  for (vector<pobject_t>::iterator p = ls.begin(); 
+  for (vector<sobject_t>::iterator p = ls.begin(); 
        p != ls.end(); 
        p++, i++, q++) {
     q->first = *p;
@@ -1985,7 +1985,7 @@ void PG::build_scrub_map(ScrubMap &map)
   // tab is now sorted, with ->second indicating object's original position
   vector<int> pos(ls.size());
   i = 0;
-  for (vector< pair<pobject_t,int> >::iterator p = tab.begin(); 
+  for (vector< pair<sobject_t,int> >::iterator p = tab.begin(); 
        p != tab.end(); 
        p++, i++)
     pos[p->second] = i;
@@ -1994,10 +1994,10 @@ void PG::build_scrub_map(ScrubMap &map)
   dout(10) << " scanning " << ls.size() << " objects" << dendl;
   map.objects.resize(ls.size());
   i = 0;
-  for (vector<pobject_t>::iterator p = ls.begin(); 
+  for (vector<sobject_t>::iterator p = ls.begin(); 
        p != ls.end(); 
        p++, i++) {
-    pobject_t poid = *p;
+    sobject_t poid = *p;
 
     ScrubMap::object& o = map.objects[pos[i]];
     o.poid = *p;
@@ -2075,7 +2075,7 @@ void PG::scrub()
     dout(10) << "scrub  requesting scrubmap from osd" << acting[i] << dendl;
     vector<ceph_osd_op> scrub(1);
     scrub[0].op = CEPH_OSD_OP_SCRUB;
-    pobject_t poid;
+    sobject_t poid;
     eversion_t v;
     osd_reqid_t reqid;
     MOSDSubOp *subop = new MOSDSubOp(reqid, info.pgid, poid, false, 0,

diff --git a/src/osd/osd_types.h b/src/osd/osd_types.h
index 419cb7f0959917b327a7db3d74252cfdea9370e1..810dd2d929166473e1842752f1c40064fafdf8f7 100644 (file)
--- a/src/osd/osd_types.h
+++ b/src/osd/osd_types.h
@@ -130,10 +130,10 @@ struct pg_t {
   
   operator uint64_t() const { return u.pg64; }
 
-  pobject_t to_log_pobject() const { 
+  sobject_t to_log_pobject() const { 
     char foo[20];
     sprintf(foo, "pg_log_%llx", (long long unsigned)u.pg64);
-    return pobject_t(object_t(foo), CEPH_NOSNAP);
+    return sobject_t(object_t(foo), CEPH_NOSNAP);
   }
 
   coll_t to_coll() const {
@@ -798,7 +798,7 @@ inline ostream& operator<<(ostream& out, const object_info_t& oi) {
  */
 struct ScrubMap {
   struct object {
-    pobject_t poid;
+    sobject_t poid;
     __u64 size;
     map<nstring,bufferptr> attrs;
 

diff --git a/src/streamtest.cc b/src/streamtest.cc
index 5882142f2cb99dccdec665f63632d5ebace49dba..a8b76e4a1eeb35bdd1caf52c4aeeba0ea8e9b6c5 100644 (file)
--- a/src/streamtest.cc
+++ b/src/streamtest.cc
@@ -117,7 +117,7 @@ int main(int argc, const char **argv)
   //cout << "stop at " << end << std::endl;
   cout << "# offset\tack\tcommit" << std::endl;
   while (now < end) {
-    pobject_t poid(object_t("streamtest"), 0);
+    sobject_t poid(object_t("streamtest"), 0);
     utime_t start = now;
     set_start(pos, now);
     ObjectStore::Transaction t;