Merge pull request #13712 from linuxbox2/wip-dtor-fhcache

rgw_file: RGWFileHandle dtor must also cond-unlink from FHCache
ceph · Mar 4, 2017 · e180639 · e180639
2 parents 60bb2a8 + d51a3b1
commit e180639
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/src/rgw/rgw_file.cc b/src/rgw/rgw_file.cc
@@ -777,6 +777,11 @@ namespace rgw {
   }
 
   RGWFileHandle::~RGWFileHandle() {
+    /* in the non-delete case, handle may still be in handle table */
+    if (fh_hook.is_linked()) {
+      fs->fh_cache.remove(fh.fh_hk.object, this, FHCache::FLAG_LOCK);
+    }
+    /* cond-unref parent */
     if (parent && (! parent->is_root())) {
       /* safe because if parent->unref causes its deletion,
        * there are a) by refcnt, no other objects/paths pointing