From 9492099066461c7eda02f2a0d98edce20dcf0762 Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Fri, 28 Jun 2019 11:35:54 +0800 Subject: [PATCH] [PATCH] os/bluestore/BlueFS: use uint64_t for `len` change the type of parameter `len` of `BlueFS::_read_random()` from `size_t` to `uint64_t`. i think the type of `size_t` comes from `rocksdb::RandomAccessFile::Read(uint64_t offset, size_t n, rocksdb::Slice* result, char* scratch)`. and when we implement this method, we continued using `n`'s type. but, we are using it with `std::min()`, for instance, where the template parameter type deduction fails if the lhs and rhs parameters' types are different. so probaly the better solution is to use `uint64_t` directly to avoid the the cast and specializing the template. Signed-off-by: Kefu Chai Gbp-Pq: Name bluefs-use-uint64_t-for-len.patch --- src/os/bluestore/BlueFS.cc | 4 ++-- src/os/bluestore/BlueFS.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/os/bluestore/BlueFS.cc b/src/os/bluestore/BlueFS.cc index f7a629231..eaff6a29c 100644 --- a/src/os/bluestore/BlueFS.cc +++ b/src/os/bluestore/BlueFS.cc @@ -1526,7 +1526,7 @@ void BlueFS::_drop_link(FileRef file) int BlueFS::_read_random( FileReader *h, ///< [in] read from here uint64_t off, ///< [in] offset - size_t len, ///< [in] this many bytes + uint64_t len, ///< [in] this many bytes char *out) ///< [out] optional: or copy it here { auto* buf = &h->buf; @@ -1556,7 +1556,7 @@ int BlueFS::_read_random( s_lock.unlock(); uint64_t x_off = 0; auto p = h->file->fnode.seek(off, &x_off); - uint64_t l = std::min(p->length - x_off, static_cast(len)); + uint64_t l = std::min(p->length - x_off, len); dout(20) << __func__ << " read random 0x" << std::hex << x_off << "~" << l << std::dec << " of " << *p << dendl; diff --git a/src/os/bluestore/BlueFS.h b/src/os/bluestore/BlueFS.h index f51312395..2861d25d6 100644 --- a/src/os/bluestore/BlueFS.h +++ b/src/os/bluestore/BlueFS.h @@ -412,7 +412,7 @@ private: int _read_random( FileReader *h, ///< [in] read from here uint64_t offset, ///< [in] offset - size_t len, ///< [in] this many bytes + uint64_t len, ///< [in] this many bytes char *out); ///< [out] optional: or copy it here void _invalidate_cache(FileRef f, uint64_t offset, uint64_t length); -- 2.30.2