rgw_file: remove RGWLibFS::mkdir() (no longer called)

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>

diff --git a/src/rgw/rgw_file.cc b/src/rgw/rgw_file.cc
index 5c67a2ec2795562b7a957ce09e95a1318239f296..19a35e1964d0f641f3ae989c36b534e4dd5837d6 100644 (file)
--- a/src/rgw/rgw_file.cc
+++ b/src/rgw/rgw_file.cc
@@ -315,68 +315,6 @@ namespace rgw {
     MkObjResult mkr{nullptr, -EINVAL};
     int rc, rc2;
 
-    LookupFHResult fhr;
-    RGWFileHandle* rgw_fh = nullptr;
-
-    if (parent->is_root()) {
-      /* bucket */
-      string bname{name};
-      /* enforce S3 name restrictions */
-      rc = valid_s3_bucket_name(bname, false /* relaxed */);
-      if (rc != 0) {
-       rc = -EINVAL;
-       goto out;
-      }
-
-      string uri = "/" + bname; /* XXX get rid of URI some day soon */
-      RGWCreateBucketRequest req(get_context(), get_user(), uri);
-      rc = rgwlib.get_fe()->execute_req(&req);
-      rc2 = req.get_ret();
-    } else {
-      /* create an object representing the directory */
-      buffer::list bl;
-      string dir_name = /* XXX get rid of this some day soon, too */
-       parent->relative_object_name();
-      /* creating objects w/leading '/' makes a mess */
-      if ((dir_name.size() > 0) &&
-         (dir_name.back() != '/'))
-       dir_name += "/";
-      dir_name += name;
-      dir_name += "/";
-      RGWPutObjRequest req(get_context(), get_user(), parent->bucket_name(),
-                         dir_name, bl);
-      rc = rgwlib.get_fe()->execute_req(&req);
-      rc2 = req.get_ret();
-    }
-
-    if ((rc == 0) &&
-       (rc2 == 0)) {
-      fhr = lookup_fh(parent, name,
-                     RGWFileHandle::FLAG_CREATE|
-                     RGWFileHandle::FLAG_DIRECTORY);
-      rgw_fh = get<0>(fhr);
-      if (rgw_fh) {
-       /* XXX unify timestamps */
-       rgw_fh->create_stat(st, mask);
-       rgw_fh->set_times(real_clock::now());
-       rgw_fh->stat(st);
-       get<0>(mkr) = rgw_fh;
-      } else
-       rc = -EIO;
-    }
-
-  out:
-    get<1>(mkr) = rc;
-
-    return mkr;
-  } /* RGWLibFS::mkdir */
-
-  MkObjResult RGWLibFS::mkdir2(RGWFileHandle* parent, const char *name,
-                              struct stat *st, uint32_t mask, uint32_t flags)
-  {
-    MkObjResult mkr{nullptr, -EINVAL};
-    int rc, rc2;
-
     LookupFHResult fhr;
     RGWFileHandle* rgw_fh = nullptr;
     buffer::list ux_attrs;
@@ -450,7 +388,7 @@ namespace rgw {
     get<1>(mkr) = rc;
 
     return mkr;
-  } /* RGWLibFS::mkdir2 */
+  } /* RGWLibFS::mkdir */
 
   MkObjResult RGWLibFS::create(RGWFileHandle* parent, const char *name,
                              struct stat *st, uint32_t mask, uint32_t flags)
@@ -1022,7 +960,7 @@ int rgw_mkdir(struct rgw_fs *rgw_fs,
     return -EINVAL;
   }
 
-  MkObjResult fhr = fs->mkdir2(parent, name, st, mask, flags);
+  MkObjResult fhr = fs->mkdir(parent, name, st, mask, flags);
   RGWFileHandle *nfh = get<0>(fhr); // nullptr if !success
 
   if (nfh)