diff options
Diffstat (limited to 'src/rgw/driver/rados/rgw_rados.h')
| -rw-r--r-- | src/rgw/driver/rados/rgw_rados.h | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/src/rgw/driver/rados/rgw_rados.h b/src/rgw/driver/rados/rgw_rados.h index f61730cb4de..986dc091163 100644 --- a/src/rgw/driver/rados/rgw_rados.h +++ b/src/rgw/driver/rados/rgw_rados.h @@ -33,13 +33,13 @@ #include "rgw_aio.h" #include "rgw_d3n_cacherequest.h" -#include "services/svc_rados.h" #include "services/svc_bi_rados.h" #include "common/Throttle.h" #include "common/ceph_mutex.h" #include "rgw_cache.h" #include "rgw_sal_fwd.h" #include "rgw_pubsub.h" +#include "rgw_tools.h" struct D3nDataCache; @@ -576,7 +576,7 @@ public: } - int get_raw_obj_ref(const DoutPrefixProvider *dpp, const rgw_raw_obj& obj, rgw_rados_ref *ref); + int get_raw_obj_ref(const DoutPrefixProvider *dpp, rgw_raw_obj obj, rgw_rados_ref *ref); int list_raw_objects_init(const DoutPrefixProvider *dpp, const rgw_pool& pool, const std::string& marker, RGWListRawObjsCtx *ctx); int list_raw_objects_next(const DoutPrefixProvider *dpp, const std::string& prefix_filter, int max, @@ -651,7 +651,7 @@ public: RGWRados *store; rgw_bucket bucket; int shard_id; - RGWSI_RADOS::Obj bucket_obj; + rgw_rados_ref bucket_obj; explicit BucketShard(RGWRados *_store) : store(_store), shard_id(-1) {} int init(const rgw_bucket& _bucket, const rgw_obj& obj, @@ -664,7 +664,7 @@ public: friend std::ostream& operator<<(std::ostream& out, const BucketShard& bs) { out << "BucketShard:{ bucket=" << bs.bucket << ", shard_id=" << bs.shard_id << - ", bucket_ojb=" << bs.bucket_obj << "}"; + ", bucket_obj=" << bs.bucket_obj << "}"; return out; } }; @@ -1023,14 +1023,13 @@ public: rgw_obj_key end_marker; std::string ns; bool enforce_ns; - RGWAccessListFilter* access_list_filter; + rgw::AccessListFilter access_list_filter; RGWBucketListNameFilter force_check_filter; bool list_versions; bool allow_unordered; Params() : enforce_ns(true), - access_list_filter(nullptr), list_versions(false), allow_unordered(false) {} @@ -1401,7 +1400,7 @@ public: int decode_policy(const DoutPrefixProvider *dpp, bufferlist& bl, ACLOwner *owner); int get_bucket_stats(const DoutPrefixProvider *dpp, RGWBucketInfo& bucket_info, const rgw::bucket_index_layout_generation& idx_layout, int shard_id, std::string *bucket_ver, std::string *master_ver, std::map<RGWObjCategory, RGWStorageStats>& stats, std::string *max_marker, bool* syncstopped = NULL); - int get_bucket_stats_async(const DoutPrefixProvider *dpp, RGWBucketInfo& bucket_info, const rgw::bucket_index_layout_generation& idx_layout, int shard_id, RGWGetBucketStats_CB *cb); + int get_bucket_stats_async(const DoutPrefixProvider *dpp, RGWBucketInfo& bucket_info, const rgw::bucket_index_layout_generation& idx_layout, int shard_id, boost::intrusive_ptr<rgw::sal::ReadStatsCB> cb); int put_bucket_instance_info(RGWBucketInfo& info, bool exclusive, ceph::real_time mtime, const std::map<std::string, bufferlist> *pattrs, const DoutPrefixProvider *dpp, optional_yield y); /* xxx dang obj_ctx -> svc */ @@ -1483,7 +1482,7 @@ public: int cls_bucket_head_async(const DoutPrefixProvider *dpp, const RGWBucketInfo& bucket_info, const rgw::bucket_index_layout_generation& idx_layout, - int shard_id, RGWGetDirHeader_CB *ctx, int *num_aio); + int shard_id, boost::intrusive_ptr<RGWGetDirHeader_CB> cb, int *num_aio); int bi_get_instance(const DoutPrefixProvider *dpp, const RGWBucketInfo& bucket_info, const rgw_obj& obj, rgw_bucket_dir_entry *dirent, optional_yield y); int bi_get_olh(const DoutPrefixProvider *dpp, const RGWBucketInfo& bucket_info, const rgw_obj& obj, rgw_bucket_olh_entry *olh, optional_yield y); int bi_get(const DoutPrefixProvider *dpp, const RGWBucketInfo& bucket_info, const rgw_obj& obj, BIIndexType index_type, rgw_cls_bi_entry *entry, optional_yield y); @@ -1638,7 +1637,7 @@ public: */ int pool_iterate(const DoutPrefixProvider *dpp, RGWPoolIterCtx& ctx, uint32_t num, std::vector<rgw_bucket_dir_entry>& objs, - bool *is_truncated, RGWAccessListFilter *filter); + bool *is_truncated, const rgw::AccessListFilter& filter); uint64_t next_bucket_id(); |