librgw: avoid illegal rele()

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

diff --git a/src/rgw/rgw_file.cc b/src/rgw/rgw_file.cc
index c0f0105300e528923cfec7c941bd2d72be08d03f..2d9a80f4e853addbf7bc0865b9395adc3c570039 100644 (file)
--- a/src/rgw/rgw_file.cc
+++ b/src/rgw/rgw_file.cc
@@ -271,9 +271,6 @@ int rgw_readdir(struct rgw_fs *rgw_fs,
 {
   int rc;
 
-  /* XXXX remove uri, deal with bucket and object names */
-  string uri;
-
   RGWLibFS *fs = static_cast<RGWLibFS*>(rgw_fs->fs_private);
   CephContext* cct = static_cast<CephContext*>(rgw_fs->rgw);
 
@@ -295,7 +292,8 @@ int rgw_readdir(struct rgw_fs *rgw_fs,
     /*
      * bucket?
      */
-    uri += "/";
+    /* XXXX remove uri, deal with bucket and object names */
+    string uri = "/" + parent->bucket_name() + "/";
     RGWListBucketRequest req(cct, fs->get_user(), uri, rcb, cb_arg, offset);
     rc = librgw.get_fe()->execute_req(&req);
 

diff --git a/src/test/librgw_file.cc b/src/test/librgw_file.cc
index e7192c8e4de28758710f30a21da1c51cdd309e90..d6406142251519ea558a6e1f357f710afd562ba1 100644 (file)
--- a/src/test/librgw_file.cc
+++ b/src/test/librgw_file.cc
@@ -132,7 +132,8 @@ TEST(LibRGW, CLEANUP) {
   using std::get;
   for (auto& fids : { fids1, fids2 }) {
     for (auto& fid : fids) {
-      ret = rgw_fh_rele(fs, get<2>(fid), 0 /* flags */);
+      /* XXX readdir only looked up their names (atm), don't try to rele() */
+      //ret = rgw_fh_rele(fs, get<2>(fid), 0 /* flags */);
     }
   }
 }