From 266012959306be371ef9220cd1289699c58ff862 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Wed, 3 Oct 2012 15:11:08 -0700 Subject: [PATCH] librbd: make rollback use new striping accessors Signed-off-by: Sage Weil --- src/librbd/internal.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/librbd/internal.cc b/src/librbd/internal.cc index 22c10e8a20419..f67f15ff6d8ac 100644 --- a/src/librbd/internal.cc +++ b/src/librbd/internal.cc @@ -354,12 +354,12 @@ namespace librbd { ProgressContext& prog_ctx) { assert(ictx->md_lock.is_locked()); - uint64_t numseg = get_max_block(ictx->size, ictx->order); - uint64_t bsize = get_block_size(ictx->order); + uint64_t numseg = ictx->get_num_objects(); + uint64_t bsize = ictx->get_object_size(); for (uint64_t i = 0; i < numseg; i++) { int r; - string oid = get_block_oid(ictx->object_prefix, i, ictx->old_format); + string oid = ictx->get_object_name(i); r = ictx->data_ctx.selfmanaged_snap_rollback(oid, snap_id); ldout(ictx->cct, 10) << "selfmanaged_snap_rollback on " << oid << " to " << snap_id << " returned " << r << dendl; -- 2.39.5