]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw: remove comments 6784/head
authorYehuda Sadeh <yehuda@redhat.com>
Mon, 30 Nov 2015 21:57:56 +0000 (13:57 -0800)
committerYehuda Sadeh <yehuda@redhat.com>
Wed, 2 Dec 2015 18:45:42 +0000 (10:45 -0800)
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
src/rgw/rgw_acl_s3.cc
src/rgw/rgw_bucket.cc

index d9130e0d94a36d3ed588dc2d86fee096e981db5f..aecb7a3e66a90385f12298f2ee05f86c257c5231 100644 (file)
@@ -516,7 +516,7 @@ int RGWAccessControlPolicy_S3::rebuild(RGWRados *store, ACLOwner *owner, RGWAcce
           ldout(cct, 0) << "ERROR: src_grant.get_id() failed" << dendl;
           return -EINVAL;
         }
-        email = u.id;  // XXX none of that .to_str() stuff here, but why?
+        email = u.id;
         ldout(cct, 10) << "grant user email=" << email << dendl;
         if (rgw_get_user_info_by_email(store, email, grant_user) < 0) {
           ldout(cct, 10) << "grant user email not found or other error" << dendl;
index 456700dfe45452fb7584b7b2439ac76f011d4763..5f83ba45cb41a006c75f53758dc65eb74df725f3 100644 (file)
@@ -168,7 +168,6 @@ int rgw_bucket_sync_user_stats(RGWRados *store, const string& tenant_name, const
 int rgw_link_bucket(RGWRados *store, const rgw_user& user_id, rgw_bucket& bucket, time_t creation_time, bool update_entrypoint)
 {
   int ret;
-  // XXX Actually, should we use user_id.tenant when creating bucket?
   string& tenant_name = bucket.tenant;
   string& bucket_name = bucket.name;
 
@@ -1770,7 +1769,6 @@ public:
 
     if (!exists || old_bci.info.bucket.bucket_id != bci.info.bucket.bucket_id) {
       /* a new bucket, we need to select a new bucket placement for it */
-      // XXX not sure if this is correct -- stolen from Radoslaw; what about get()?
       string tenant_name;
       string bucket_name;
       parse_bucket(entry, tenant_name, bucket_name);