Skip to content

Commit 37f8a2c

Browse files
committed
rgw/sal: remove Bucket::get_acl_owner()
was only used under the line by rados and dbstores Signed-off-by: Casey Bodley <[email protected]>
1 parent 96f65fd commit 37f8a2c

File tree

5 files changed

+2
-6
lines changed

5 files changed

+2
-6
lines changed

src/rgw/driver/rados/rgw_sal_rados.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2229,7 +2229,7 @@ int RadosMultipartUpload::abort(const DoutPrefixProvider *dpp, CephContext *cct,
22292229
}
22302230

22312231
std::unique_ptr<rgw::sal::Object::DeleteOp> del_op = meta_obj->get_delete_op();
2232-
del_op->params.bucket_owner = bucket->get_acl_owner();
2232+
del_op->params.bucket_owner = bucket->get_info().owner;
22332233
del_op->params.versioning_status = 0;
22342234
if (!remove_objs.empty()) {
22352235
del_op->params.remove_objs = &remove_objs;

src/rgw/rgw_sal.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -699,8 +699,6 @@ class Bucket {
699699
virtual bool is_owner(User* user) = 0;
700700
/** Get the owner of this bucket */
701701
virtual User* get_owner(void) = 0;
702-
/** Get the owner of this bucket in the form of an ACLOwner object */
703-
virtual ACLOwner get_acl_owner(void) = 0;
704702
/** Check in the backing store if this bucket is empty */
705703
virtual int check_empty(const DoutPrefixProvider* dpp, optional_yield y) = 0;
706704
/** Chec k if the given size fits within the quota */

src/rgw/rgw_sal_dbstore.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -796,7 +796,7 @@ namespace rgw::sal {
796796
int ret;
797797

798798
std::unique_ptr<rgw::sal::Object::DeleteOp> del_op = meta_obj->get_delete_op();
799-
del_op->params.bucket_owner = bucket->get_acl_owner();
799+
del_op->params.bucket_owner = bucket->get_info().owner;
800800
del_op->params.versioning_status = 0;
801801

802802
// Since the data objects are associated with meta obj till

src/rgw/rgw_sal_filter.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -413,7 +413,6 @@ class FilterBucket : public Bucket {
413413
ceph::real_time mtime, optional_yield y) override;
414414
virtual bool is_owner(User* user) override;
415415
virtual User* get_owner(void) override { return user; }
416-
virtual ACLOwner get_acl_owner(void) override { return next->get_acl_owner(); }
417416
virtual int check_empty(const DoutPrefixProvider* dpp, optional_yield y) override;
418417
virtual int check_quota(const DoutPrefixProvider *dpp, RGWQuota& quota,
419418
uint64_t obj_size, optional_yield y,

src/rgw/rgw_sal_store.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,6 @@ class StoreBucket : public Bucket {
104104
virtual User* get_owner(void) override { return owner; };
105105
/* Make sure to call get_bucket_info() if you need it first */
106106
virtual bool is_owner(User* user) override { return (info.owner.compare(user->get_id()) == 0); }
107-
virtual ACLOwner get_acl_owner(void) override { return ACLOwner(info.owner); };
108107
virtual bool empty() const override { return info.bucket.name.empty(); }
109108
virtual const std::string& get_name() const override { return info.bucket.name; }
110109
virtual const std::string& get_tenant() const override { return info.bucket.tenant; }

0 commit comments

Comments
 (0)