Merge pull request ceph#15541 from guihecheng/rgw_file-cleanup

rgw_file: replace raw fs->fh_lru.unref with predefined fs->unref
yet · Jun 9, 2017 · 05a390b · 05a390b
2 parents ab43b0d + fcd313e
commit 05a390b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/src/rgw/rgw_file.cc b/src/rgw/rgw_file.cc
@@ -760,7 +760,7 @@ namespace rgw {
 	  << fh->name
 	  << " before ObjUnref refs=" << fh->get_refcnt()
 	  << dendl;
-	fs->fh_lru.unref(fh, cohort::lru::FLAG_NONE);
+	fs->unref(fh);
       }
     };
 
@@ -932,7 +932,7 @@ namespace rgw {
        * no unsafe iterators reaching it either--n.b., this constraint
        * is binding oncode which may in future attempt to e.g.,
        * cause the eviction of objects in LRU order */
-      (void) get_fs()->fh_lru.unref(parent, cohort::lru::FLAG_NONE);
+      (void) get_fs()->unref(parent);
     }
   }
 

diff --git a/src/rgw/rgw_file.h b/src/rgw/rgw_file.h
@@ -1133,7 +1133,6 @@ namespace rgw {
       if (! fh) {
 	if (unlikely(fh_hk == root_fh.fh.fh_hk)) {
 	  fh = &root_fh;
-	  ref(fh);
 	}
       }