From 1690d3814ed50939939134837a7a75348aa7d20c Mon Sep 17 00:00:00 2001
From: Patrick Donnelly <pdonnell@redhat.com>
Date: Thu, 13 Aug 2020 13:29:23 -0700
Subject: [PATCH] librbd: convert WHITELIST to ALLOWLIST

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
---
 src/librbd/api/Trash.cc | 2 +-
 src/librbd/api/Trash.h  | 2 +-
 src/librbd/librbd.cc    | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/librbd/api/Trash.cc b/src/librbd/api/Trash.cc
index eb847e3900d62..2fef6900d2945 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_WHITELIST {
+const typename Trash<I>::TrashImageSources Trash<I>::RESTORE_SOURCE_ALLOWLIST {
     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 65b6b8bc4fda1..486747eb49444 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_WHITELIST;
+  static const TrashImageSources RESTORE_SOURCE_ALLOWLIST;
 
   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 34c47ea885e3f..e1b006b3ccaa6 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_WHITELIST, id, name);
+      io_ctx, librbd::api::Trash<>::RESTORE_SOURCE_ALLOWLIST, 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_WHITELIST, id, name);
+      io_ctx, librbd::api::Trash<>::RESTORE_SOURCE_ALLOWLIST, id, name);
   tracepoint(librbd, trash_undelete_exit, r);
   return r;
 }
-- 
2.39.5