src/messages/: s/sobject_t/hobject_t

Signed-off-by: Samuel Just <samuel.just@dreamhost.com>

diff --git a/src/messages/MOSDSubOp.h b/src/messages/MOSDSubOp.h
index 75eaf912486b5c821ab05e101be5d2cdc1524817..597278c0c09d68dc2741493f83fe2fe021d005f3 100644 (file)
--- a/src/messages/MOSDSubOp.h
+++ b/src/messages/MOSDSubOp.h
@@ -32,7 +32,7 @@ public:
   
   // subop
   pg_t pgid;
-  sobject_t poid;
+  hobject_t poid;
   object_locator_t oloc;
   
   __u8 acks_wanted;
@@ -63,7 +63,7 @@ public:
   map<string,bufferptr> attrset;
 
   interval_set<uint64_t> data_subset;
-  map<sobject_t, interval_set<uint64_t> > clone_subsets;
+  map<hobject_t, interval_set<uint64_t> > clone_subsets;
 
   bool first, complete;
 
@@ -149,7 +149,7 @@ public:
   }
 
 
-  MOSDSubOp(osd_reqid_t r, pg_t p, const sobject_t& po, bool noop_, int aw,
+  MOSDSubOp(osd_reqid_t r, pg_t p, const hobject_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 e5f7e0229e245677d990e09a174be2583b114410..2603cdd1392a19adc87903c424b045ebd8b58f90 100644 (file)
--- a/src/messages/MOSDSubOpReply.h
+++ b/src/messages/MOSDSubOpReply.h
@@ -36,7 +36,7 @@ public:
   // subop metadata
   osd_reqid_t reqid;
   pg_t pgid;
-  sobject_t poid;
+  hobject_t poid;
 
   vector<OSDOp> ops;
 
@@ -89,7 +89,7 @@ public:
   epoch_t get_map_epoch() { return map_epoch; }
 
   pg_t get_pg() { return pgid; }
-  sobject_t get_poid() { return poid; }
+  hobject_t get_poid() { return poid; }
 
   int get_ack_type() { return ack_type; }
   bool is_ondisk() { return ack_type & CEPH_OSD_FLAG_ONDISK; }