Zipper - remove duplicate get_user()

Signed-off-by: Daniel Gryniewicz <dang@redhat.com>

diff --git a/src/rgw/rgw_sal.h b/src/rgw/rgw_sal.h
index 1f115a445e4beb71fc0a58fc5a9055242ddb2d4e..3214046c225acb61573a87b88875988b97e4f521 100644 (file)
--- a/src/rgw/rgw_sal.h
+++ b/src/rgw/rgw_sal.h
@@ -257,7 +257,6 @@ class RGWUser {
     virtual int store_info(const DoutPrefixProvider *dpp, optional_yield y, const RGWUserCtl::PutParams& params = {}) = 0;
 
     /* dang temporary; will be removed when User is complete */
-    rgw_user& get_user() { return info.user_id; }
     RGWUserInfo& get_info() { return info; }
 
     friend inline ostream& operator<<(ostream& out, const RGWUser& u) {

diff --git a/src/rgw/rgw_sal_rados.cc b/src/rgw/rgw_sal_rados.cc
index 6ef10b9b65c63e89927d3913f87497541b91e9f0..af3e795ee59524bf5c7206303e78ac97965a9289 100644 (file)
--- a/src/rgw/rgw_sal_rados.cc
+++ b/src/rgw/rgw_sal_rados.cc
@@ -85,7 +85,7 @@ static int rgw_op_get_bucket_policy_from_attr(const DoutPrefixProvider *dpp,
     if (r < 0)
       return r;
 
-    policy->create_default(user.get_user(), user.get_display_name());
+    policy->create_default(user.get_id(), user.get_display_name());
   }
   return 0;
 }
@@ -386,13 +386,13 @@ int RGWRadosBucket::link(const DoutPrefixProvider *dpp, RGWUser* new_user, optio
 {
   RGWBucketEntryPoint ep;
   ep.bucket = info.bucket;
-  ep.owner = new_user->get_user();
+  ep.owner = new_user->get_id();
   ep.creation_time = get_creation_time();
   ep.linked = true;
   RGWAttrs ep_attrs;
   rgw_ep_info ep_data{ep, ep_attrs};
 
-  int r = store->ctl()->bucket->link_bucket(new_user->get_user(), info.bucket,
+  int r = store->ctl()->bucket->link_bucket(new_user->get_id(), info.bucket,
                                            get_creation_time(), y, dpp, update_entrypoint,
                                            &ep_data);
   if (r < 0)
@@ -416,7 +416,7 @@ int RGWRadosBucket::chown(const DoutPrefixProvider *dpp, RGWUser* new_user, RGWU
   if (marker == nullptr)
     marker = &obj_marker;
 
-  return store->ctl()->bucket->chown(store, this, new_user->get_user(),
+  return store->ctl()->bucket->chown(store, this, new_user->get_id(),
                           old_user->get_display_name(), *marker, y, dpp);
 }
 
@@ -443,7 +443,7 @@ int RGWRadosBucket::remove_instance_info(const DoutPrefixProvider *dpp, RGWObjVe
 /* Make sure to call get_bucket_info() if you need it first */
 bool RGWRadosBucket::is_owner(RGWUser* user)
 {
-  return (info.owner.compare(user->get_user()) == 0);
+  return (info.owner.compare(user->get_id()) == 0);
 }
 
 int RGWRadosBucket::check_empty(const DoutPrefixProvider *dpp, optional_yield y)
@@ -454,7 +454,7 @@ int RGWRadosBucket::check_empty(const DoutPrefixProvider *dpp, optional_yield y)
 int RGWRadosBucket::check_quota(RGWQuotaInfo& user_quota, RGWQuotaInfo& bucket_quota, uint64_t obj_size,
                                optional_yield y, bool check_size_only)
 {
-    return store->getRados()->check_quota(owner->get_user(), get_key(),
+    return store->getRados()->check_quota(owner->get_id(), get_key(),
                                          user_quota, bucket_quota, obj_size, y, check_size_only);
 }
 

diff --git a/src/rgw/rgw_user.cc b/src/rgw/rgw_user.cc
index 7aa43fe055abddd6ee66129d2eae12d912c8d17f..93de8df5d1f0e40a355115ac452814977cb3d786 100644 (file)
--- a/src/rgw/rgw_user.cc
+++ b/src/rgw/rgw_user.cc
@@ -1653,7 +1653,7 @@ int RGWUser::execute_rename(const DoutPrefixProvider *dpp, RGWUserAdminOpState&
 
   // create a stub user and write only the uid index and buckets object
   RGWUserInfo stub_user_info;
-  stub_user_info.user_id = new_user->get_user();
+  stub_user_info.user_id = new_user->get_id();
 
   RGWObjVersionTracker objv;
   const bool exclusive = !op_state.get_overwrite_new_user(); // overwrite if requested
@@ -1672,7 +1672,7 @@ int RGWUser::execute_rename(const DoutPrefixProvider *dpp, RGWUserAdminOpState&
   }
 
   RGWAccessControlPolicy policy_instance;
-  policy_instance.create_default(new_user->get_user(), old_user->get_display_name());
+  policy_instance.create_default(new_user->get_id(), old_user->get_display_name());
 
   //unlink and link buckets to new user
   string marker;
@@ -1723,10 +1723,10 @@ int RGWUser::execute_rename(const DoutPrefixProvider *dpp, RGWUserAdminOpState&
   // update the 'stub user' with all of the other fields and rewrite all of the
   // associated index objects
   RGWUserInfo& user_info = op_state.get_user_info();
-  user_info.user_id = new_user->get_user();
+  user_info.user_id = new_user->get_id();
   op_state.objv = objv;
 
-  rename_swift_keys(new_user->get_user(), user_info.swift_keys);
+  rename_swift_keys(new_user->get_id(), user_info.swift_keys);
 
   return update(dpp, op_state, err_msg, y);
 }