buffer: use alignof for raw_combined allocation arithmetic

Signed-off-by: Sage Weil <sage@redhat.com>

diff --git a/src/common/buffer.cc b/src/common/buffer.cc
index ee274a019f45cf70d1cd275a596f2c46c29e5d51..ae1ffbe4b3f3d97675a561120da6fd4fcc854c7f 100644 (file)
--- a/src/common/buffer.cc
+++ b/src/common/buffer.cc
@@ -261,8 +261,9 @@ static simple_spinlock_t buffer_debug_lock = SIMPLE_SPINLOCK_INITIALIZER;
     static raw_combined *create(unsigned len, unsigned align=0) {
       if (!align)
        align = sizeof(size_t);
-      size_t rawlen = ROUND_UP_TO(sizeof(buffer::raw_combined), sizeof(size_t));
-      size_t datalen = ROUND_UP_TO(len, sizeof(size_t));
+      size_t rawlen = ROUND_UP_TO(sizeof(buffer::raw_combined),
+                                 alignof(buffer::raw_combined));
+      size_t datalen = ROUND_UP_TO(len, alignof(buffer::raw_combined));
 
 #ifdef DARWIN
       char *ptr = (char *) valloc(rawlen + datalen);