Skip to content

Commit 62e95e1

Browse files
cbodleycbodley
committed
rgw/user: remove unused 'meta backend ctx' arguments
Signed-off-by: Casey Bodley <[email protected]>
1 parent a589873 commit 62e95e1

File tree

4 files changed

+74
-123
lines changed

4 files changed

+74
-123
lines changed

‎src/rgw/driver/rados/rgw_user.cc‎

Lines changed: 42 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -2723,7 +2723,7 @@ class RGWUserMetadataHandler : public RGWMetadataHandler_GenericMetaBE {
27232723

27242724
rgw_user user = RGWSI_User::user_from_meta_key(entry);
27252725

2726-
int ret = svc.user->read_user_info(op->ctx(), user, &uci.info, &objv_tracker,
2726+
int ret = svc.user->read_user_info(user, &uci.info, &objv_tracker,
27272727
&mtime, nullptr, &uci.attrs,
27282728
y, dpp);
27292729
if (ret < 0) {
@@ -2760,15 +2760,14 @@ class RGWUserMetadataHandler : public RGWMetadataHandler_GenericMetaBE {
27602760

27612761
rgw_user user = RGWSI_User::user_from_meta_key(entry);
27622762

2763-
int ret = svc.user->read_user_info(op->ctx(), user, &info, nullptr,
2763+
int ret = svc.user->read_user_info(user, &info, nullptr,
27642764
nullptr, nullptr, nullptr,
27652765
y, dpp);
27662766
if (ret < 0) {
27672767
return ret;
27682768
}
27692769

2770-
return svc.user->remove_user_info(op->ctx(), info, &objv_tracker,
2771-
y, dpp);
2770+
return svc.user->remove_user_info(info, &objv_tracker, y, dpp);
27722771
}
27732772
};
27742773

@@ -2813,7 +2812,7 @@ int RGWMetadataHandlerPut_User::put_checked(const DoutPrefixProvider *dpp)
28132812

28142813
auto mtime = obj->get_mtime();
28152814

2816-
int ret = uhandler->svc.user->store_user_info(op->ctx(), uci.info, pold_info,
2815+
int ret = uhandler->svc.user->store_user_info(uci.info, pold_info,
28172816
&objv_tracker, mtime,
28182817
false, pattrs, y, dpp);
28192818
if (ret < 0) {
@@ -2864,17 +2863,14 @@ int RGWUserCtl::get_info_by_uid(const DoutPrefixProvider *dpp,
28642863
const GetParams& params)
28652864

28662865
{
2867-
return be_handler->call([&](RGWSI_MetaBackend_Handler::Op *op) {
2868-
return svc.user->read_user_info(op->ctx(),
2869-
uid,
2870-
info,
2871-
params.objv_tracker,
2872-
params.mtime,
2873-
params.cache_info,
2874-
params.attrs,
2875-
y,
2876-
dpp);
2877-
});
2866+
return svc.user->read_user_info(uid,
2867+
info,
2868+
params.objv_tracker,
2869+
params.mtime,
2870+
params.cache_info,
2871+
params.attrs,
2872+
y,
2873+
dpp);
28782874
}
28792875

28802876
int RGWUserCtl::get_info_by_email(const DoutPrefixProvider *dpp,
@@ -2883,15 +2879,13 @@ int RGWUserCtl::get_info_by_email(const DoutPrefixProvider *dpp,
28832879
optional_yield y,
28842880
const GetParams& params)
28852881
{
2886-
return be_handler->call([&](RGWSI_MetaBackend_Handler::Op *op) {
2887-
return svc.user->get_user_info_by_email(op->ctx(), email,
2888-
info,
2889-
params.objv_tracker,
2890-
params.attrs,
2891-
params.mtime,
2892-
y,
2893-
dpp);
2894-
});
2882+
return svc.user->get_user_info_by_email(email,
2883+
info,
2884+
params.objv_tracker,
2885+
params.attrs,
2886+
params.mtime,
2887+
y,
2888+
dpp);
28952889
}
28962890

28972891
int RGWUserCtl::get_info_by_swift(const DoutPrefixProvider *dpp,
@@ -2900,15 +2894,13 @@ int RGWUserCtl::get_info_by_swift(const DoutPrefixProvider *dpp,
29002894
optional_yield y,
29012895
const GetParams& params)
29022896
{
2903-
return be_handler->call([&](RGWSI_MetaBackend_Handler::Op *op) {
2904-
return svc.user->get_user_info_by_swift(op->ctx(), swift_name,
2905-
info,
2906-
params.objv_tracker,
2907-
params.attrs,
2908-
params.mtime,
2909-
y,
2910-
dpp);
2911-
});
2897+
return svc.user->get_user_info_by_swift(swift_name,
2898+
info,
2899+
params.objv_tracker,
2900+
params.attrs,
2901+
params.mtime,
2902+
y,
2903+
dpp);
29122904
}
29132905

29142906
int RGWUserCtl::get_info_by_access_key(const DoutPrefixProvider *dpp,
@@ -2917,15 +2909,13 @@ int RGWUserCtl::get_info_by_access_key(const DoutPrefixProvider *dpp,
29172909
optional_yield y,
29182910
const GetParams& params)
29192911
{
2920-
return be_handler->call([&](RGWSI_MetaBackend_Handler::Op *op) {
2921-
return svc.user->get_user_info_by_access_key(op->ctx(), access_key,
2922-
info,
2923-
params.objv_tracker,
2924-
params.attrs,
2925-
params.mtime,
2926-
y,
2927-
dpp);
2928-
});
2912+
return svc.user->get_user_info_by_access_key(access_key,
2913+
info,
2914+
params.objv_tracker,
2915+
params.attrs,
2916+
params.mtime,
2917+
y,
2918+
dpp);
29292919
}
29302920

29312921
int RGWUserCtl::get_attrs_by_uid(const DoutPrefixProvider *dpp,
@@ -2945,32 +2935,22 @@ int RGWUserCtl::store_info(const DoutPrefixProvider *dpp,
29452935
const RGWUserInfo& info, optional_yield y,
29462936
const PutParams& params)
29472937
{
2948-
string key = RGWSI_User::get_meta_key(info.user_id);
2949-
2950-
return be_handler->call([&](RGWSI_MetaBackend_Handler::Op *op) {
2951-
return svc.user->store_user_info(op->ctx(), info,
2952-
params.old_info,
2953-
params.objv_tracker,
2954-
params.mtime,
2955-
params.exclusive,
2956-
params.attrs,
2957-
y,
2958-
dpp);
2959-
});
2938+
return svc.user->store_user_info(info,
2939+
params.old_info,
2940+
params.objv_tracker,
2941+
params.mtime,
2942+
params.exclusive,
2943+
params.attrs,
2944+
y,
2945+
dpp);
29602946
}
29612947

29622948
int RGWUserCtl::remove_info(const DoutPrefixProvider *dpp,
29632949
const RGWUserInfo& info, optional_yield y,
29642950
const RemoveParams& params)
29652951

29662952
{
2967-
string key = RGWSI_User::get_meta_key(info.user_id);
2968-
2969-
return be_handler->call([&](RGWSI_MetaBackend_Handler::Op *op) {
2970-
return svc.user->remove_user_info(op->ctx(), info,
2971-
params.objv_tracker,
2972-
y, dpp);
2973-
});
2953+
return svc.user->remove_user_info(info, params.objv_tracker, y, dpp);
29742954
}
29752955

29762956
RGWMetadataHandler *RGWUserMetaHandlerAllocator::alloc(RGWSI_User *user_svc) {

‎src/rgw/services/svc_user.h‎

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,7 @@ class RGWSI_User : public RGWServiceInstance
4444

4545
virtual rgw_raw_obj get_buckets_obj(const rgw_user& user_id) const = 0;
4646

47-
virtual int read_user_info(RGWSI_MetaBackend::Context *ctx,
48-
const rgw_user& user,
47+
virtual int read_user_info(const rgw_user& user,
4948
RGWUserInfo *info,
5049
RGWObjVersionTracker * const objv_tracker,
5150
real_time * const pmtime,
@@ -54,8 +53,7 @@ class RGWSI_User : public RGWServiceInstance
5453
optional_yield y,
5554
const DoutPrefixProvider *dpp) = 0;
5655

57-
virtual int store_user_info(RGWSI_MetaBackend::Context *ctx,
58-
const RGWUserInfo& info,
56+
virtual int store_user_info(const RGWUserInfo& info,
5957
RGWUserInfo *old_info,
6058
RGWObjVersionTracker *objv_tracker,
6159
const real_time& mtime,
@@ -64,29 +62,25 @@ class RGWSI_User : public RGWServiceInstance
6462
optional_yield y,
6563
const DoutPrefixProvider *dpp) = 0;
6664

67-
virtual int remove_user_info(RGWSI_MetaBackend::Context *ctx,
68-
const RGWUserInfo& info,
65+
virtual int remove_user_info(const RGWUserInfo& info,
6966
RGWObjVersionTracker *objv_tracker,
7067
optional_yield y,
7168
const DoutPrefixProvider *dpp) = 0;
7269

73-
virtual int get_user_info_by_email(RGWSI_MetaBackend::Context *ctx,
74-
const std::string& email, RGWUserInfo *info,
70+
virtual int get_user_info_by_email(const std::string& email, RGWUserInfo *info,
7571
RGWObjVersionTracker *objv_tracker,
7672
std::map<std::string, bufferlist>* pattrs,
7773
real_time *pmtime,
7874
optional_yield y,
7975
const DoutPrefixProvider *dpp) = 0;
80-
virtual int get_user_info_by_swift(RGWSI_MetaBackend::Context *ctx,
81-
const std::string& swift_name,
76+
virtual int get_user_info_by_swift(const std::string& swift_name,
8277
RGWUserInfo *info, /* out */
8378
RGWObjVersionTracker * const objv_tracker,
8479
std::map<std::string, bufferlist>* pattrs,
8580
real_time * const pmtime,
8681
optional_yield y,
8782
const DoutPrefixProvider *dpp) = 0;
88-
virtual int get_user_info_by_access_key(RGWSI_MetaBackend::Context *ctx,
89-
const std::string& access_key,
83+
virtual int get_user_info_by_access_key(const std::string& access_key,
9084
RGWUserInfo *info,
9185
RGWObjVersionTracker* objv_tracker,
9286
std::map<std::string, bufferlist>* pattrs,

0 commit comments

Comments
 (0)