]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
FileJournal.h: add attribute __packed where needed
authorColin Patrick McCabe <cmccabe@alumni.cmu.edu>
Thu, 14 Oct 2010 18:12:49 +0000 (11:12 -0700)
committerColin Patrick McCabe <cmccabe@alumni.cmu.edu>
Thu, 14 Oct 2010 19:09:24 +0000 (12:09 -0700)
Signed-off-by: Colin McCabe <colinm@hq.newdream.net>
src/os/FileJournal.h

index 983e48029dc01ba5059d29196cc0dd9607d738bc..f3bbda522b8fb5e515fa09acbfbe3bde334c4bee 100644 (file)
@@ -44,7 +44,7 @@ public:
     void clear() {
       start = block_size;
     }
-  } header;
+  } header __attribute__((__packed__, aligned(4)));
 
   struct entry_header_t {
     uint64_t seq;  // fs op seq #
@@ -63,7 +63,7 @@ public:
        magic1 == (uint64_t)pos &&
        magic2 == (fsid ^ seq ^ len);
     }
-  };
+  } __attribute__((__packed__, aligned(4)));
 
 private:
   string fn;