rgw: remove the rgw_buckets files

We don't need them any more. Hurrah!

Signed-off-by: Greg Farnum <gregory.farnum@dreamhost.com>

diff --git a/src/Makefile.am b/src/Makefile.am
index 609e110152ac6fcdceb846896bf701941fe6664b..f1c1987e016151226060ec9f353490789904626d 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -309,7 +309,6 @@ my_radosgw_src = \
        rgw/rgw_fs.cc \
        rgw/rgw_rados.cc \
        rgw/rgw_tools.cc \
-       rgw/rgw_bucket.cc \
        rgw/rgw_user.cc \
        rgw/rgw_access.cc \
        rgw/rgw_op.cc \
@@ -1367,7 +1366,6 @@ noinst_HEADERS = \
        rgw/rgw_rest_swift.h\
        rgw/rgw_rest_s3.h\
        rgw/rgw_tools.h\
-       rgw/rgw_bucket.h\
        rgw/rgw_user.h\
        sample.ceph.conf\
        tools/common.h\

diff --git a/src/rgw/rgw_admin.cc b/src/rgw/rgw_admin.cc
index 402515f3ab08fc27d5abc7d4ae20a5f7cc622e00..749f5d601c423a6ea95997fab59e4389f91c0fad 100644 (file)
--- a/src/rgw/rgw_admin.cc
+++ b/src/rgw/rgw_admin.cc
@@ -14,7 +14,6 @@ using namespace std;
 
 #include "common/armor.h"
 #include "rgw_user.h"
-#include "rgw_bucket.h"
 #include "rgw_access.h"
 #include "rgw_acl.h"
 #include "rgw_log.h"

diff --git a/src/rgw/rgw_bucket.cc b/src/rgw/rgw_bucket.cc
deleted file mode 100644 (file)
index 8a5346d..0000000
--- a/src/rgw/rgw_bucket.cc
+++ /dev/null
@@ -1,13 +0,0 @@
-#include <errno.h>
-
-#include <string>
-
-#include "common/errno.h"
-#include "rgw_access.h"
-
-#include "rgw_bucket.h"
-#include "rgw_tools.h"
-
-static rgw_bucket pi_buckets(BUCKETS_POOL_NAME);
-
-static string pool_name_prefix = "p";

diff --git a/src/rgw/rgw_bucket.h b/src/rgw/rgw_bucket.h
deleted file mode 100644 (file)
index 60870d7..0000000
--- a/src/rgw/rgw_bucket.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef CEPH_RGW_BUCKET_H
-#define CEPH_RGW_BUCKET_H
-
-#include <string>
-
-#include "include/types.h"
-#include "rgw_common.h"
-
-#define BUCKETS_POOL_NAME ".rgw"
-
-extern int rgw_get_bucket_info_id(uint64_t bucket_id, RGWBucketInfo& info);
-extern int rgw_get_bucket_info(string& bucket_name, RGWBucketInfo& info);
-extern int rgw_store_bucket_info(RGWBucketInfo& info);
-extern int rgw_create_bucket(std::string& id, string& bucket_name, rgw_bucket& bucket,
-                      map<std::string, bufferlist>& attrs, bool exclusive = true, uint64_t auid = 0);
-
-
-#endif
-
-

diff --git a/src/rgw/rgw_log.cc b/src/rgw/rgw_log.cc
index be03794ef3c3f7ad66ec358b6a0a9a12f28d4e84..cb8c5aa00c77ddfa06a866852f8c14c9a51c5628 100644 (file)
--- a/src/rgw/rgw_log.cc
+++ b/src/rgw/rgw_log.cc
@@ -3,7 +3,6 @@
 #include "rgw_log.h"
 #include "rgw_acl.h"
 #include "rgw_access.h"
-#include "rgw_bucket.h"
 
 static rgw_bucket log_bucket(RGW_LOG_POOL_NAME);
 

diff --git a/src/rgw/rgw_main.cc b/src/rgw/rgw_main.cc
index 53dfe343b25ee6c03b30fc6575acf516992a97b3..9355671c7019a6573d21dc3d13041167d5741fdc 100644 (file)
--- a/src/rgw/rgw_main.cc
+++ b/src/rgw/rgw_main.cc
@@ -26,7 +26,6 @@
 #include "rgw_rest.h"
 #include "rgw_swift.h"
 #include "rgw_log.h"
-#include "rgw_bucket.h"
 
 #include <map>
 #include <string>

diff --git a/src/rgw/rgw_op.cc b/src/rgw/rgw_op.cc
index 17ba579da1df86a2dbe95dcc4663c2c144f28942..79b79322257fb618e7548333c57af911201d1964 100644 (file)
--- a/src/rgw/rgw_op.cc
+++ b/src/rgw/rgw_op.cc
@@ -14,7 +14,6 @@
 #include "rgw_rest.h"
 #include "rgw_acl.h"
 #include "rgw_user.h"
-#include "rgw_bucket.h"
 #include "rgw_log.h"
 #include "rgw_multi.h"
 

diff --git a/src/rgw/rgw_rados.cc b/src/rgw/rgw_rados.cc
index 2064f9a9aada8b15dc0805e2243732c2a534b3c0..f17f863c283ff7749d82e28e7f383643ceafdc72 100644 (file)
--- a/src/rgw/rgw_rados.cc
+++ b/src/rgw/rgw_rados.cc
@@ -30,11 +30,10 @@ static string notify_oid = "notify";
 static string shadow_ns = "shadow";
 static string bucket_marker_ver_oid = ".rgw.bucket-marker-ver";
 static string dir_oid_prefix = ".dir.";
-static string default_storage_pool(DEFAULT_BUCKET_STORE_POOL);
+static string default_storage_pool = ".rgw.buckets";
 static string avail_pools = ".pools.avail";
 
-#include "rgw/rgw_bucket.h"
-static rgw_bucket pi_buckets_rados(BUCKETS_POOL_NAME);
+static rgw_bucket pi_buckets_rados = RGW_ROOT_BUCKET;
 
 
 static RGWObjCategory shadow_category = RGW_OBJ_CATEGORY_SHADOW;

diff --git a/src/rgw/rgw_rados.h b/src/rgw/rgw_rados.h
index 0df2a52aa2502d3fc2a2df3ed67b908dbfc0d731..4011cd39e85cecae1a7d59e0555ed7b614d02f2c 100644 (file)
--- a/src/rgw/rgw_rados.h
+++ b/src/rgw/rgw_rados.h
@@ -11,8 +11,6 @@ class RGWWatcher;
 class SafeTimer;
 class ACLOwner;
 
-#define DEFAULT_BUCKET_STORE_POOL ".rgw.buckets"
-
 struct RGWObjState {
   bool is_atomic;
   bool has_attrs;

diff --git a/src/rgw/rgw_tools.cc b/src/rgw/rgw_tools.cc
index 5092a36957c24dd744e1154a29b707f0bc3a3b3e..e58d92659b4dc940dcc6f5ad4e11496545e78529 100644 (file)
--- a/src/rgw/rgw_tools.cc
+++ b/src/rgw/rgw_tools.cc
@@ -7,7 +7,6 @@
 #include "rgw_common.h"
 #include "rgw_access.h"
 #include "rgw_tools.h"
-#include "rgw_bucket.h"
 
 #define READ_CHUNK_LEN (16 * 1024)
 

diff --git a/src/rgw/rgw_user.cc b/src/rgw/rgw_user.cc
index 6e4dcc78ab676d6e5083976616f1a96e62f3306f..2b9436f9b63fc9e8f833985f04f4164146d9d08d 100644 (file)
--- a/src/rgw/rgw_user.cc
+++ b/src/rgw/rgw_user.cc
@@ -9,7 +9,6 @@
 
 #include "include/types.h"
 #include "rgw_user.h"
-#include "rgw_bucket.h"
 
 using namespace std;