os: Clean up endian handling

Replace remaining uses of __le32 in Transaction.h with uint32_t.
These objects are only used locally and do not require endian swaps.

This change is a no-op on all architectures.

Signed-off-by: Ulrich Weigand <ulrich.weigand@de.ibm.com>

diff --git a/src/os/Transaction.h b/src/os/Transaction.h
index 3d924ff9abad083209986611d2a635f6263cc2c7..1463d006159168ebb30053c05f85a9d9418d04cc 100644 (file)
--- a/src/os/Transaction.h
+++ b/src/os/Transaction.h
@@ -237,11 +237,11 @@ public:
 private:
   TransactionData data;
 
-  std::map<coll_t, __le32> coll_index;
-  std::map<ghobject_t, __le32> object_index;
+  std::map<coll_t, uint32_t> coll_index;
+  std::map<ghobject_t, uint32_t> object_index;
 
-  __le32 coll_id {0};
-  __le32 object_id {0};
+  uint32_t coll_id = 0;
+  uint32_t object_id = 0;
 
   ceph::buffer::list data_bl;
   ceph::buffer::list op_bl;
@@ -297,7 +297,7 @@ public:
   Transaction& operator=(const Transaction& other) = default;
 
   // expose object_index for FileStore::Op's benefit
-  const std::map<ghobject_t, __le32>& get_object_index() const {
+  const std::map<ghobject_t, uint32_t>& get_object_index() const {
     return object_index;
   }
 
@@ -394,8 +394,8 @@ public:
   }
 
   void _update_op(Op* op,
-    std::vector<__le32> &cm,
-    std::vector<__le32> &om) {
+    std::vector<uint32_t> &cm,
+    std::vector<uint32_t> &om) {
 
     switch (op->op) {
     case OP_NOP:
@@ -494,8 +494,8 @@ public:
   }
   void _update_op_bl(
     ceph::buffer::list& bl,
-    std::vector<__le32> &cm,
-    std::vector<__le32> &om) {
+    std::vector<uint32_t> &cm,
+    std::vector<uint32_t> &om) {
     for (auto& bp : bl.buffers()) {
       ceph_assert(bp.length() % sizeof(Op) == 0);
 
@@ -522,16 +522,16 @@ public:
     on_applied_sync.splice(on_applied_sync.end(), other.on_applied_sync);
 
     //append coll_index & object_index
-    std::vector<__le32> cm(other.coll_index.size());
-    std::map<coll_t, __le32>::iterator coll_index_p;
+    std::vector<uint32_t> cm(other.coll_index.size());
+    std::map<coll_t, uint32_t>::iterator coll_index_p;
     for (coll_index_p = other.coll_index.begin();
          coll_index_p != other.coll_index.end();
          ++coll_index_p) {
       cm[coll_index_p->second] = _get_coll_id(coll_index_p->first);
     }
 
-    std::vector<__le32> om(other.object_index.size());
-    std::map<ghobject_t, __le32>::iterator object_index_p;
+    std::vector<uint32_t> om(other.object_index.size());
+    std::map<ghobject_t, uint32_t>::iterator object_index_p;
     for (object_index_p = other.object_index.begin();
          object_index_p != other.object_index.end();
          ++object_index_p) {
@@ -570,7 +570,7 @@ public:
     size_t final_size = sizeof(__u32) * 2 + sizeof(data);
 
     // coll_index second and object_index second
-    final_size += (coll_index.size() + object_index.size()) * sizeof(__le32);
+    final_size += (coll_index.size() + object_index.size()) * sizeof(__u32);
 
     // coll_index first
     for (auto p = coll_index.begin(); p != coll_index.end(); ++p) {
@@ -665,14 +665,14 @@ public:
       ops = t->data.ops;
       op_buffer_p = t->op_bl.c_str();
 
-      std::map<coll_t, __le32>::iterator coll_index_p;
+      std::map<coll_t, uint32_t>::iterator coll_index_p;
       for (coll_index_p = t->coll_index.begin();
            coll_index_p != t->coll_index.end();
            ++coll_index_p) {
         colls[coll_index_p->second] = coll_index_p->first;
       }
 
-      std::map<ghobject_t, __le32>::iterator object_index_p;
+      std::map<ghobject_t, uint32_t>::iterator object_index_p;
       for (object_index_p = t->object_index.begin();
            object_index_p != t->object_index.end();
            ++object_index_p) {
@@ -729,11 +729,11 @@ public:
       decode_str_set_to_bl(data_bl_p, pbl);
     }
 
-    const ghobject_t &get_oid(__le32 oid_id) {
+    const ghobject_t &get_oid(uint32_t oid_id) {
       ceph_assert(oid_id < objects.size());
       return objects[oid_id];
     }
-    const coll_t &get_cid(__le32 cid_id) {
+    const coll_t &get_cid(uint32_t cid_id) {
       ceph_assert(cid_id < colls.size());
       return colls[cid_id];
     }
@@ -767,21 +767,21 @@ private:
     memset(p, 0, sizeof(Op));
     return reinterpret_cast<Op*>(p);
   }
-  __le32 _get_coll_id(const coll_t& coll) {
-    std::map<coll_t, __le32>::iterator c = coll_index.find(coll);
+  uint32_t _get_coll_id(const coll_t& coll) {
+    std::map<coll_t, uint32_t>::iterator c = coll_index.find(coll);
     if (c != coll_index.end())
       return c->second;
 
-    __le32 index_id = coll_id++;
+    uint32_t index_id = coll_id++;
     coll_index[coll] = index_id;
     return index_id;
   }
-  __le32 _get_object_id(const ghobject_t& oid) {
-    std::map<ghobject_t, __le32>::iterator o = object_index.find(oid);
+  uint32_t _get_object_id(const ghobject_t& oid) {
+    std::map<ghobject_t, uint32_t>::iterator o = object_index.find(oid);
     if (o != object_index.end())
       return o->second;
 
-    __le32 index_id = object_id++;
+    uint32_t index_id = object_id++;
     object_index[oid] = index_id;
     return index_id;
   }