From: Neha Ojha <nojha@redhat.com>
Date: Wed, 19 Aug 2020 17:30:38 +0000 (+0000)
Subject: librbd: RESTORE_SOURCE_WHITELIST -> ALLOWED_RESTORE_SOURCES
X-Git-Tag: v16.1.0~1334^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=22271213911ac731a7acc85b1d7ced1d92677679;p=ceph.git

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 2fef6900d294..9c02fb943ebc 100644
--- 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 486747eb4944..66f819dfa24e 100644
--- 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 e1b006b3ccaa..f968ee442fdc 100644
--- 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;
 }