]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw: remove withdraw_pool function.
authorGreg Farnum <gregory.farnum@dreamhost.com>
Mon, 3 Oct 2011 19:02:19 +0000 (12:02 -0700)
committerGreg Farnum <gregory.farnum@dreamhost.com>
Mon, 3 Oct 2011 21:32:17 +0000 (14:32 -0700)
I think its use was broken anyway?

Signed-off-by: Greg Farnum <gregory.farnum@dreamhost.com>
src/rgw/rgw_bucket.cc

index 574c7d1c7f0653e9170546b9c3e173d0f42cb1f3..48ad185fa883f7176eabcf41e760db6ca0ba6ce2 100644 (file)
@@ -74,13 +74,6 @@ int rgw_get_bucket_info_id(uint64_t bucket_id, RGWBucketInfo& info)
   return rgw_get_bucket_info(bucket_string, info);
 }
 
-static int withdraw_pool(string& pool_name)
-{
-  rgw_obj obj(pi_buckets, avail_pools);
-  bufferlist bl;
-  return rgwstore->tmap_set(obj, pool_name, bl);
-}
-
 int rgw_bucket_select_host_pool(string& bucket_name, rgw_bucket& bucket)
 {
   bufferlist header;
@@ -140,11 +133,7 @@ int rgw_create_bucket(std::string& id, string& bucket_name, rgw_bucket& bucket,
      return ret;
 
   ret = rgwstore->create_bucket(id, bucket, attrs, false, true, exclusive, auid);
-  if (ret == -EEXIST) {
-    // wow, isn't that horribly broken due to multiple EEXIST returns?
-    // or is something else going on here?
-    return withdraw_pool(bucket.pool);
-  }
+
   if (ret < 0)
     return ret;