From 5e20ffe907e2b94497e88f315bd0d008ee762cd1 Mon Sep 17 00:00:00 2001 From: Jason Dillaman Date: Tue, 25 Aug 2015 15:45:28 -0400 Subject: [PATCH] cls_rbd: dir_rename_image is now async Signed-off-by: Jason Dillaman --- src/cls/rbd/cls_rbd_client.cc | 6 +++--- src/cls/rbd/cls_rbd_client.h | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/cls/rbd/cls_rbd_client.cc b/src/cls/rbd/cls_rbd_client.cc index 31a31a445b137..be0c256c164d5 100644 --- a/src/cls/rbd/cls_rbd_client.cc +++ b/src/cls/rbd/cls_rbd_client.cc @@ -807,15 +807,15 @@ struct C_ObjectMapLoad : public Context { return ioctx->exec(oid, "rbd", "dir_remove_image", in, out); } - int dir_rename_image(librados::IoCtx *ioctx, const std::string &oid, + void dir_rename_image(librados::ObjectWriteOperation *op, const std::string &src, const std::string &dest, const std::string &id) { - bufferlist in, out; + bufferlist in; ::encode(src, in); ::encode(dest, in); ::encode(id, in); - return ioctx->exec(oid, "rbd", "dir_rename_image", in, out); + op->exec("rbd", "dir_rename_image", in); } int object_map_load(librados::IoCtx *ioctx, const std::string &oid, diff --git a/src/cls/rbd/cls_rbd_client.h b/src/cls/rbd/cls_rbd_client.h index 98bd1cfcb1f41..34af5427a328a 100644 --- a/src/cls/rbd/cls_rbd_client.h +++ b/src/cls/rbd/cls_rbd_client.h @@ -122,9 +122,9 @@ namespace librbd { int dir_remove_image(librados::IoCtx *ioctx, const std::string &oid, const std::string &name, const std::string &id); // atomic remove and add - int dir_rename_image(librados::IoCtx *ioctx, const std::string &oid, - const std::string &src, const std::string &dest, - const std::string &id); + void dir_rename_image(librados::ObjectWriteOperation *op, + const std::string &src, const std::string &dest, + const std::string &id); // operations on the rbd_object_map.$image_id object int object_map_load(librados::IoCtx *ioctx, const std::string &oid, -- 2.39.5