update source to Ceph Pacific 16.2.2

[ceph.git] / ceph / src / rgw / rgw_object_expirer.cc

diff --git a/ceph/src/rgw/rgw_object_expirer.cc b/ceph/src/rgw/rgw_object_expirer.cc
index d5e0dceee373757ea0e7f269c6963253a69df461..cf30693baa496844dd7017d13dd8216ac8c76fb9 100644 (file)
--- a/ceph/src/rgw/rgw_object_expirer.cc
+++ b/ceph/src/rgw/rgw_object_expirer.cc
@@ -23,7 +23,6 @@
 
 #include "rgw_user.h"
 #include "rgw_bucket.h"
-#include "rgw_rados.h"
 #include "rgw_acl.h"
 #include "rgw_acl_s3.h"
 #include "rgw_log.h"
@@ -67,7 +66,7 @@ int main(const int argc, const char **argv)
 
   auto cct = global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT,
                         CODE_ENVIRONMENT_DAEMON,
-                        CINIT_FLAG_UNPRIVILEGED_DAEMON_DEFAULTS, "rgw_data");
+                        CINIT_FLAG_UNPRIVILEGED_DAEMON_DEFAULTS);
 
   for (std::vector<const char *>::iterator i = args.begin(); i != args.end(); ) {
     if (ceph_argparse_double_dash(args, i)) {