librbd: RESTORE_SOURCE_WHITELIST -> ALLOWED_RESTORE_SOURCES

Signed-off-by: Neha Ojha <nojha@redhat.com>

diff --git a/src/librbd/api/Trash.cc b/src/librbd/api/Trash.cc
index 2fef6900d29453e7b131ec0cb7dedc015be8470f..9c02fb943ebc2521499b15f8c079c9528016d142 100644 (file)
--- a/src/librbd/api/Trash.cc
+++ b/src/librbd/api/Trash.cc
@@ -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

diff --git a/src/librbd/api/Trash.h b/src/librbd/api/Trash.h
index 486747eb4944413cdb3b338d387ebce479d89d57..66f819dfa24e9923534af5d1c77ef8a94ef69f70 100644 (file)
--- a/src/librbd/api/Trash.h
+++ b/src/librbd/api/Trash.h
@@ -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);

diff --git a/src/librbd/librbd.cc b/src/librbd/librbd.cc
index e1b006b3ccaa6e156341078d87898ae87824df78..f968ee442fdca5a65077151e42454397034c6c76 100644 (file)
--- a/src/librbd/librbd.cc
+++ b/src/librbd/librbd.cc
@@ -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;
 }