Merge pull request #24427 from thmour/thmour_api_purge

librbd: add trash purge api calls

Reviewed-by: Jason Dillaman <dillaman@redhat.com>

diff --cc src/librbd/api/Trash.cc
Simple merge

diff --cc src/librbd/api/Trash.h
index 34f69f498cb5c44ad0d87344a8507c93ed298861,f2e52f6cbeb1d5a4e1593a5d68a777a761b624cb..23382453f14925832f882f34f7975bdcaa6a6d83
--- 1/src/librbd/api/Trash.h
--- 2/src/librbd/api/Trash.h
+++ b/src/librbd/api/Trash.h
@@@ -27,10 -27,11 +27,12 @@@ struct Trash 
                   trash_image_info_t *info);
    static int list(librados::IoCtx &io_ctx,
                    std::vector<trash_image_info_t> &entries);
+   static int purge(IoCtx& io_ctx, time_t expire_ts,
+                    float threshold, ProgressContext& pctx);
    static int remove(librados::IoCtx &io_ctx, const std::string &image_id,
                      bool force, ProgressContext& prog_ctx);
 -  static int restore(librados::IoCtx &io_ctx, const std::string &image_id,
 +  static int restore(librados::IoCtx &io_ctx, rbd_trash_image_source_t source,
 +                     const std::string &image_id,
                       const std::string &image_new_name);
  
  };

diff --cc src/librbd/librbd.cc
Simple merge

diff --cc src/test/librbd/test_librbd.cc
Simple merge

diff --cc src/tools/rbd/action/Trash.cc
Simple merge