From: Mykola Golub Date: Thu, 6 Apr 2023 15:38:02 +0000 (-0400) Subject: rgw/rados: check_quota() uses real bucket owner X-Git-Tag: v17.2.7~382^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=aef830d39eafdce4eba455c40e0b1aa5fdaeb3fb;p=ceph.git rgw/rados: check_quota() uses real bucket owner Fixes: https://tracker.ceph.com/issues/58725 Signed-off-by: Mykola Golub Signed-off-by: Casey Bodley (cherry picked from commit 13299bccc6ae42579a9def4776270abd334e9efe) Conflicts: src/rgw/rgw_sal_rados.cc (check_quota has different signature) --- diff --git a/src/rgw/rgw_sal_rados.cc b/src/rgw/rgw_sal_rados.cc index 3288f2e2d06e..6cc1555e78ea 100644 --- a/src/rgw/rgw_sal_rados.cc +++ b/src/rgw/rgw_sal_rados.cc @@ -735,7 +735,7 @@ int RadosBucket::check_empty(const DoutPrefixProvider* dpp, optional_yield y) int RadosBucket::check_quota(const DoutPrefixProvider *dpp, RGWQuotaInfo& user_quota, RGWQuotaInfo& bucket_quota, uint64_t obj_size, optional_yield y, bool check_size_only) { - return store->getRados()->check_quota(dpp, owner->get_id(), get_key(), + return store->getRados()->check_quota(dpp, info.owner, get_key(), user_quota, bucket_quota, obj_size, y, check_size_only); }