From: Igor Fedotov <ifedotov@suse.com>
Date: Wed, 8 Apr 2020 21:06:14 +0000 (+0300)
Subject: os/bluestore: fix huge (>4GB) bluefs reads
X-Git-Tag: v15.2.10~2^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F39701%2Fhead;p=ceph.git

os/bluestore: fix huge (>4GB) bluefs reads

Signed-off-by: Igor Fedotov <ifedotov@suse.com>
(cherry picked from commit fe558c4dd12b25b2d523987f22fde5b5898cfb83)

 Conflicts:
(still present buf param in BlueFS::read, lack of )https://github.com/ceph/ceph/pull/34421)
	src/os/bluestore/BlueFS.h
	src/os/bluestore/BlueRocksEnv.cc
	src/test/objectstore/test_bluefs.cc
---

diff --git a/src/test/objectstore/test_bluefs.cc b/src/test/objectstore/test_bluefs.cc
index 5f1dd140256a..68db26f77f5f 100644
--- a/src/test/objectstore/test_bluefs.cc
+++ b/src/test/objectstore/test_bluefs.cc
@@ -304,7 +304,7 @@ TEST(BlueFS, very_large_write) {
     unique_ptr<char> huge_buf(new char[h->file->fnode.size]);
     auto l = h->file->fnode.size;
     int64_t r = fs.read(h, &readbuf, 0, l, NULL, huge_buf.get());
-    ASSERT_EQ(r, l);
+    ASSERT_EQ(r, (int64_t)l);
     delete h;
   }
   fs.umount();