From: Sebastien Ponce <sebastien.ponce@cern.ch>
Date: Thu, 26 Jun 2014 13:00:15 +0000 (+0200)
Subject: Fixed build on 32 bits platforms
X-Git-Tag: v0.83~36^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F2032%2Fhead;p=ceph.git

Fixed build on 32 bits platforms

Signed-off-by: Sebastien Ponce <sebastien.ponce@cern.ch>
---

diff --git a/src/libradosstriper/RadosStriperImpl.cc b/src/libradosstriper/RadosStriperImpl.cc
index 5d8e2f067c63..559a7780bab7 100644
--- a/src/libradosstriper/RadosStriperImpl.cc
+++ b/src/libradosstriper/RadosStriperImpl.cc
@@ -301,7 +301,7 @@ int libradosstriper::RadosStriperImpl::append(const std::string& soid,
   // open the object. This will create it if needed, retrieve its layout
   // and size and take a shared lock on it
   ceph_file_layout layout;
-  size_t size = len;
+  uint64_t size = len;
   std::string lockCookie;
   int rc = openStripedObjectForWrite(soid, &layout, &size, &lockCookie, false);
   if (rc) return rc;
@@ -356,7 +356,7 @@ int libradosstriper::RadosStriperImpl::aio_append(const std::string& soid,
 						  size_t len)
 {
   ceph_file_layout layout;
-  size_t size = len;
+  uint64_t size = len;
   std::string lockCookie;
   int rc = openStripedObjectForWrite(soid, &layout, &size, &lockCookie, false);
   if (rc) return rc;
@@ -441,7 +441,7 @@ int libradosstriper::RadosStriperImpl::aio_read(const std::string& soid,
   // open the object. This will retrieve its layout and size
   // and take a shared lock on it
   ceph_file_layout layout;
-  size_t size;
+  uint64_t size;
   std::string lockCookie;
   int rc = openStripedObjectForRead(soid, &layout, &size, &lockCookie);
   if (rc) return rc;
@@ -829,7 +829,9 @@ int libradosstriper::RadosStriperImpl::internal_get_layout_and_size(const std::s
   rc = extract_uint32_attr(attrs, XATTR_LAYOUT_OBJECT_SIZE, &layout->fl_object_size);
   if (rc) return rc;
   // deal with size
-  rc = extract_sizet_attr(attrs, XATTR_SIZE, size);
+  size_t ssize;
+  rc = extract_sizet_attr(attrs, XATTR_SIZE, &ssize);
+  *size = ssize;
   return rc;
 }