minor fixes; pack dstructs

git-svn-id: https://ceph.svn.sf.net/svnroot/ceph@2218 29311d96-e01e-0410-9327-a35deaab8ce9

diff --git a/branches/ebofs/include/interval_set.h b/branches/ebofs/include/interval_set.h
index bc5edbc29441d33dd8a3b03ee18cf58594c83786..2b536020f391fb5256686f1698520313f34a09a7 100644 (file)
--- a/branches/ebofs/include/interval_set.h
+++ b/branches/ebofs/include/interval_set.h
@@ -34,6 +34,8 @@ class interval_set {
  public:
   map<T,T> m;   // map start -> len  
   int _size;
+  
+  interval_set() : _size(0) {}
 
   // helpers
  private:

diff --git a/branches/ebofs/include/object.h b/branches/ebofs/include/object.h
index 39e67212be23ce69889000a729bf58646fa203e4..b9968390f9797fb503d3f6a3961255b3291feed7 100644 (file)
--- a/branches/ebofs/include/object.h
+++ b/branches/ebofs/include/object.h
@@ -38,7 +38,7 @@ struct object_t {
   object_t() : ino(0), bno(0), rev(0) {}
   object_t(uint64_t i, uint32_t b) : ino(i), bno(b), rev(0) {}
   object_t(uint64_t i, uint32_t b, uint32_t r) : ino(i), bno(b), rev(r) {}
-};
+} __attribute__ ((packed));
 
 inline bool operator==(const object_t l, const object_t r) {
   return memcmp(&l, &r, sizeof(l)) == 0;

diff --git a/branches/ebofs/include/pobject.h b/branches/ebofs/include/pobject.h
index a334524483719eb68871550928ed571da69d3e8b..d5671d195adb2178b085a7d79b200a71e3604ba9 100644 (file)
--- a/branches/ebofs/include/pobject.h
+++ b/branches/ebofs/include/pobject.h
@@ -30,7 +30,7 @@ struct pobject_t {
   pobject_t() : volume(0), rank(0) {}
   pobject_t(object_t o) : volume(0), rank(0), oid(o) {}  // this should go away eventually
   pobject_t(uint16_t v, uint16_t r, object_t o) : volume(v), rank(r), oid(o) {}
-};
+} __attribute__ ((packed));
 
 inline ostream& operator<<(ostream& out, const pobject_t o) {
   return out << o.volume << '/' << o.rank << '/' << o.oid;