os/bluestore: fix Allocator::allocate() int truncation

An allocation of size 0x80000000 gets truncated to 0.  Larger values can
break things in similar ways.

Introduced in 5ab034345d7320fbc86a2133c0c29ec1aca4b71a.

Fixes: http://tracker.ceph.com/issues/18595
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit e19aa8484632ac7d83aa5dc868a1fe4dc167d9b9)

diff --git a/src/os/bluestore/Allocator.h b/src/os/bluestore/Allocator.h
index cbd142d830f05ab83f831103bc50fc98ae1d4306..edf7a748f6e19dce4d1fdc56a94cdc548375a0ac 100644 (file)
--- a/src/os/bluestore/Allocator.h
+++ b/src/os/bluestore/Allocator.h
@@ -39,8 +39,8 @@ public:
                           uint64_t max_alloc_size, int64_t hint,
                           AllocExtentVector *extents) = 0;
 
-  int allocate(uint64_t want_size, uint64_t alloc_unit,
-               int64_t hint, AllocExtentVector *extents) {
+  int64_t allocate(uint64_t want_size, uint64_t alloc_unit,
+                  int64_t hint, AllocExtentVector *extents) {
     return allocate(want_size, alloc_unit, want_size, hint, extents);
   }