From 37f8a2c00bab2ee70531cda4240ffaf9b5141c47 Mon Sep 17 00:00:00 2001 From: Casey Bodley Date: Sat, 4 Nov 2023 16:40:21 -0400 Subject: [PATCH] rgw/sal: remove Bucket::get_acl_owner() was only used under the line by rados and dbstores Signed-off-by: Casey Bodley --- src/rgw/driver/rados/rgw_sal_rados.cc | 2 +- src/rgw/rgw_sal.h | 2 -- src/rgw/rgw_sal_dbstore.cc | 2 +- src/rgw/rgw_sal_filter.h | 1 - src/rgw/rgw_sal_store.h | 1 - 5 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/rgw/driver/rados/rgw_sal_rados.cc b/src/rgw/driver/rados/rgw_sal_rados.cc index c555ead9745..08722cc24b5 100644 --- a/src/rgw/driver/rados/rgw_sal_rados.cc +++ b/src/rgw/driver/rados/rgw_sal_rados.cc @@ -2229,7 +2229,7 @@ int RadosMultipartUpload::abort(const DoutPrefixProvider *dpp, CephContext *cct, } std::unique_ptr del_op = meta_obj->get_delete_op(); - del_op->params.bucket_owner = bucket->get_acl_owner(); + del_op->params.bucket_owner = bucket->get_info().owner; del_op->params.versioning_status = 0; if (!remove_objs.empty()) { del_op->params.remove_objs = &remove_objs; diff --git a/src/rgw/rgw_sal.h b/src/rgw/rgw_sal.h index b222fcd03cb..2fb2ec98a06 100644 --- a/src/rgw/rgw_sal.h +++ b/src/rgw/rgw_sal.h @@ -699,8 +699,6 @@ class Bucket { virtual bool is_owner(User* user) = 0; /** Get the owner of this bucket */ virtual User* get_owner(void) = 0; - /** Get the owner of this bucket in the form of an ACLOwner object */ - virtual ACLOwner get_acl_owner(void) = 0; /** Check in the backing store if this bucket is empty */ virtual int check_empty(const DoutPrefixProvider* dpp, optional_yield y) = 0; /** Chec k if the given size fits within the quota */ diff --git a/src/rgw/rgw_sal_dbstore.cc b/src/rgw/rgw_sal_dbstore.cc index 5140a3bfbe8..d406289f048 100644 --- a/src/rgw/rgw_sal_dbstore.cc +++ b/src/rgw/rgw_sal_dbstore.cc @@ -796,7 +796,7 @@ namespace rgw::sal { int ret; std::unique_ptr del_op = meta_obj->get_delete_op(); - del_op->params.bucket_owner = bucket->get_acl_owner(); + del_op->params.bucket_owner = bucket->get_info().owner; del_op->params.versioning_status = 0; // Since the data objects are associated with meta obj till diff --git a/src/rgw/rgw_sal_filter.h b/src/rgw/rgw_sal_filter.h index 34739c3426a..943170dd082 100644 --- a/src/rgw/rgw_sal_filter.h +++ b/src/rgw/rgw_sal_filter.h @@ -413,7 +413,6 @@ public: ceph::real_time mtime, optional_yield y) override; virtual bool is_owner(User* user) override; virtual User* get_owner(void) override { return user; } - virtual ACLOwner get_acl_owner(void) override { return next->get_acl_owner(); } virtual int check_empty(const DoutPrefixProvider* dpp, optional_yield y) override; virtual int check_quota(const DoutPrefixProvider *dpp, RGWQuota& quota, uint64_t obj_size, optional_yield y, diff --git a/src/rgw/rgw_sal_store.h b/src/rgw/rgw_sal_store.h index f5efdc3494f..943830c77fe 100644 --- a/src/rgw/rgw_sal_store.h +++ b/src/rgw/rgw_sal_store.h @@ -104,7 +104,6 @@ class StoreBucket : public Bucket { virtual User* get_owner(void) override { return owner; }; /* Make sure to call get_bucket_info() if you need it first */ virtual bool is_owner(User* user) override { return (info.owner.compare(user->get_id()) == 0); } - virtual ACLOwner get_acl_owner(void) override { return ACLOwner(info.owner); }; virtual bool empty() const override { return info.bucket.name.empty(); } virtual const std::string& get_name() const override { return info.bucket.name; } virtual const std::string& get_tenant() const override { return info.bucket.tenant; } -- 2.39.5