From cf98e9d5bf8bb45649ceea165de397604634da67 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Thu, 25 May 2017 23:09:11 -0400 Subject: [PATCH] buffer: make wasted() const Remove useless assert (we'll segv on the next line anyway). Signed-off-by: Sage Weil --- src/common/buffer.cc | 3 +-- src/include/buffer.h | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/common/buffer.cc b/src/common/buffer.cc index 5d8dcf5c27d7..50f08f1e5ca1 100644 --- a/src/common/buffer.cc +++ b/src/common/buffer.cc @@ -952,9 +952,8 @@ static std::atomic_flag buffer_debug_lock = ATOMIC_FLAG_INIT; maybe_inline_memcpy(dest, src, l, 8); } - unsigned buffer::ptr::wasted() + unsigned buffer::ptr::wasted() const { - assert(_raw); return _raw->len - _len; } diff --git a/src/include/buffer.h b/src/include/buffer.h index 177e95f8a875..2665366c514d 100644 --- a/src/include/buffer.h +++ b/src/include/buffer.h @@ -310,7 +310,7 @@ namespace buffer CEPH_BUFFER_API { bool can_zero_copy() const; int zero_copy_to_fd(int fd, int64_t *offset) const; - unsigned wasted(); + unsigned wasted() const; int cmp(const ptr& o) const; bool is_zero() const; -- 2.47.3