Merge pull request #20834 from linuxbox2/wip-linked

rgw_file: conditionally unlink handles when direct deleted Reviewed-by: Casey Bodley <cbodley@redhat.com>
ceph · Apr 12, 2018 · 68ff1f1 · 68ff1f1
2 parents 6ef24ff + 2e0f35c
commit 68ff1f1
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/src/rgw/rgw_file.cc b/src/rgw/rgw_file.cc
@@ -951,6 +951,11 @@ namespace rgw {
   }
 
   RGWFileHandle::~RGWFileHandle() {
+    /* !recycle case, handle may STILL be in handle table, BUT
+     * the partition lock is not held in this path */
+    if (fh_hook.is_linked()) {
+      fs->fh_cache.remove(fh.fh_hk.object, this, FHCache::FLAG_LOCK);
+    }
     /* cond-unref parent */
     if (parent && (! parent->is_mount())) {
       /* safe because if parent->unref causes its deletion,