From: Matt Benjamin <mbenjamin@redhat.com>
Date: Sat, 19 Dec 2015 16:34:08 +0000 (-0500)
Subject: lirgw: call RGWLibFS::close in rgw_umount
X-Git-Tag: v10.1.0~382^2~91
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9cf66708d9c1c787f7428c1d38609276ce69f7ed;p=ceph.git

lirgw: call RGWLibFS::close in rgw_umount

Also remove an unused warning in currently-disabled rgw_readv.

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

diff --git a/src/rgw/rgw_file.cc b/src/rgw/rgw_file.cc
index cbb07faad1fe..8527b98abcc4 100644
--- a/src/rgw/rgw_file.cc
+++ b/src/rgw/rgw_file.cc
@@ -402,6 +402,7 @@ extern "C" {
 int rgw_umount(struct rgw_fs *rgw_fs)
 {
   RGWLibFS *fs = static_cast<RGWLibFS*>(rgw_fs->fs_private);
+  fs->close();
   delete fs;
   return 0;
 }
@@ -922,6 +923,7 @@ void rgw_readv_rele(struct rgw_uio *uio, uint32_t flags)
 int rgw_readv(struct rgw_fs *rgw_fs,
 	      struct rgw_file_handle *fh, rgw_uio *uio)
 {
+#if 0 /* XXX */
   CephContext* cct = static_cast<CephContext*>(rgw_fs->rgw);
   RGWLibFS *fs = static_cast<RGWLibFS*>(rgw_fs->fs_private);
   RGWFileHandle* rgw_fh = get_rgwfh(fh);
@@ -930,7 +932,7 @@ int rgw_readv(struct rgw_fs *rgw_fs,
     return -EINVAL;
 
   int rc = 0;
-#if 0 /* XXX */
+
   buffer::list bl;
   RGWGetObjRequest req(cct, fs->get_user(), rgw_fh->bucket_name(),
 		      rgw_fh->object_name(), uio->uio_offset, uio->uio_resid,
@@ -964,8 +966,11 @@ int rgw_readv(struct rgw_fs *rgw_fs,
       ++ix;
     }
   }
-#endif
+
   return rc;
+#else
+  return 0;
+#endif
 }
 
 /*