RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-20 18:10:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

librbd: RESTORE_SOURCE_WHITELIST -> ALLOWED_RESTORE_SOURCES

Browse Source 
Signed-off-by: Neha Ojha <nojha@redhat.com>
This commit is contained in:
Neha Ojha 2020-08-19 17:30:38 +00:00
parent be32269fd3
commit 2227121391
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/librbd/api/Trash.cc
View File

@ -34,7 +34,7 @@ namespace librbd {
namespace api {
template <typename I>
const typename Trash<I>::TrashImageSources Trash<I>::RESTORE_SOURCE_ALLOWLIST {
const typename Trash<I>::TrashImageSources Trash<I>::ALLOWED_RESTORE_SOURCES {
cls::rbd::TRASH_IMAGE_SOURCE_USER,
cls::rbd::TRASH_IMAGE_SOURCE_MIRRORING,
cls::rbd::TRASH_IMAGE_SOURCE_USER_PARENT

2
src/librbd/api/Trash.h
View File

@ -22,7 +22,7 @@ namespace api {
template <typename ImageCtxT = librbd::ImageCtx>
struct Trash {
typedef std::set<cls::rbd::TrashImageSource> TrashImageSources;
static const TrashImageSources RESTORE_SOURCE_ALLOWLIST;
static const TrashImageSources ALLOWED_RESTORE_SOURCES;
static int move(librados::IoCtx &io_ctx, rbd_trash_image_source_t source,
const std::string &image_name, uint64_t delay);

4
src/librbd/librbd.cc
View File

@ -814,7 +814,7 @@ namespace librbd {
tracepoint(librbd, trash_undelete_enter, io_ctx.get_pool_name().c_str(),
io_ctx.get_id(), id, name);
int r = librbd::api::Trash<>::restore(
io_ctx, librbd::api::Trash<>::RESTORE_SOURCE_ALLOWLIST, id, name);
io_ctx, librbd::api::Trash<>::ALLOWED_RESTORE_SOURCES, id, name);
tracepoint(librbd, trash_undelete_exit, r);
return r;
}
@ -4026,7 +4026,7 @@ extern "C" int rbd_trash_restore(rados_ioctx_t p, const char *id,
tracepoint(librbd, trash_undelete_enter, io_ctx.get_pool_name().c_str(),
io_ctx.get_id(), id, name);
int r = librbd::api::Trash<>::restore(
io_ctx, librbd::api::Trash<>::RESTORE_SOURCE_ALLOWLIST, id, name);
io_ctx, librbd::api::Trash<>::ALLOWED_RESTORE_SOURCES, id, name);
tracepoint(librbd, trash_undelete_exit, r);
return r;
}