From 5d5863c6dfc589f39b8049c34c717a92383ed72a Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Mon, 8 Oct 2012 11:19:43 -0700 Subject: [PATCH] librbd: rename get_size() -> get_current_size() Signed-off-by: Sage Weil --- src/librbd/ImageCtx.cc | 2 +- src/librbd/ImageCtx.h | 2 +- src/librbd/internal.cc | 5 ++--- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/librbd/ImageCtx.cc b/src/librbd/ImageCtx.cc index 512d8cbc39ec6..1fc338a642b4d 100644 --- a/src/librbd/ImageCtx.cc +++ b/src/librbd/ImageCtx.cc @@ -271,7 +271,7 @@ namespace librbd { return -ENOENT; } - uint64_t ImageCtx::get_size() const + uint64_t ImageCtx::get_current_size() const { return size; } diff --git a/src/librbd/ImageCtx.h b/src/librbd/ImageCtx.h index 1c58a4ce026cb..87d2c26bbe4f8 100644 --- a/src/librbd/ImageCtx.h +++ b/src/librbd/ImageCtx.h @@ -105,7 +105,7 @@ namespace librbd { int get_snap_size(std::string in_snap_name, uint64_t *out_size) const; int is_snap_protected(string in_snap_name, bool *is_protected) const; - uint64_t get_size() const; + uint64_t get_current_size() const; uint64_t get_object_size() const; string get_object_name(uint64_t num) const; uint64_t get_num_objects() const; diff --git a/src/librbd/internal.cc b/src/librbd/internal.cc index 7dc55e837c4a9..c5c242bc24bb4 100644 --- a/src/librbd/internal.cc +++ b/src/librbd/internal.cc @@ -144,12 +144,11 @@ namespace librbd { assert(ictx->md_lock.is_locked()); CephContext *cct = (CephContext *)ictx->data_ctx.cct(); - // first object we can delete free and clear - uint64_t size = ictx->get_size(); + uint64_t size = ictx->get_current_size(); uint64_t period = ictx->get_stripe_period(); uint64_t num_period = ((newsize + period - 1) / period); uint64_t delete_off = MIN(num_period * period, size); - uint64_t delete_start = num_period * ictx->get_stripe_count(); + uint64_t delete_start = num_period * ictx->get_stripe_count(); // first object we can delete free and clear uint64_t num_objects = ictx->get_num_objects(); uint64_t object_size = ictx->get_object_size(); -- 2.39.5