From 1fd7acd8d0abea7a55e2b2f15095b3092e080ec2 Mon Sep 17 00:00:00 2001 From: Josh Durgin Date: Thu, 9 Aug 2012 15:13:46 -0700 Subject: [PATCH] rbd: fix test compilation on 32-bit 32-bit can't implicitly convert size_t or unsigned to uint64_t Signed-off-by: Josh Durgin --- src/test/rbd/fsx.c | 3 ++- src/test/rbd/test_cls_rbd.cc | 2 +- src/test/test_librbd.cc | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/test/rbd/fsx.c b/src/test/rbd/fsx.c index 8838fd3c30050..20cb13e4b8f3d 100644 --- a/src/test/rbd/fsx.c +++ b/src/test/rbd/fsx.c @@ -759,7 +759,8 @@ do_punch_hole(unsigned offset, unsigned length) prt("%lu punch\tfrom 0x%x to 0x%x, (0x%x bytes)\n", testcalls, offset, offset+length, length); } - if ((ret = rbd_discard(image, offset, length)) < 0) { + if ((ret = rbd_discard(image, (unsigned long long) offset, + (unsigned long long) length)) < 0) { prt("%punch hole: %x to %x\n", offset, length); prterrcode("do_punch_hole: discard", ret); report_failure(161); diff --git a/src/test/rbd/test_cls_rbd.cc b/src/test/rbd/test_cls_rbd.cc index 34219a281edf8..39011f9454814 100644 --- a/src/test/rbd/test_cls_rbd.cc +++ b/src/test/rbd/test_cls_rbd.cc @@ -70,7 +70,7 @@ TEST(cls_rbd, copyup) // copyup of 0-len nonexistent object should create new 0-len object ioctx.remove(oid); ASSERT_EQ(0, copyup(&ioctx, oid, inbl)); - size_t size; + uint64_t size; ASSERT_EQ(0, ioctx.stat(oid, &size, NULL)); ASSERT_EQ(0U, size); diff --git a/src/test/test_librbd.cc b/src/test/test_librbd.cc index 07fafd9d35def..51f6a2ceb9a41 100644 --- a/src/test/test_librbd.cc +++ b/src/test/test_librbd.cc @@ -616,7 +616,7 @@ void write_test_data(rbd_image_t image, const char *test_data, uint64_t off, siz assert(written == (ssize_t)len); } -void aio_discard_test_data(rbd_image_t image, uint64_t off, size_t len) +void aio_discard_test_data(rbd_image_t image, uint64_t off, uint64_t len) { rbd_completion_t comp; rbd_aio_create_completion(NULL, (rbd_callback_t) simple_write_cb, &comp); -- 2.39.5