Merge pull request #20057 from linuxbox2/jewel-rgw-latchfix

jewel: rgw: rgw_file: alternate fix deadlock on lru eviction

Reviewed-by: Nathan Cutler <ncutler@suse.com>

diff --cc src/common/cohort_lru.h
index f1a679047fd21b958bb7abba3606fcc516a75326,5c8850d9d9b736e9bd253df4269838533dfa340a..cb076e1e71f418ed858b941a7d2377fea9c9045c
--- 1/src/common/cohort_lru.h
--- 2/src/common/cohort_lru.h
+++ b/src/common/cohort_lru.h
@@@ -236,12 -228,9 +237,12 @@@ namespace cohort 
          }
          lane.lock.unlock();
        }
 +      /* unref out-of-line && !LOCKED */
 +      if (tdo)
 +        delete tdo;
        } /* unref */
  
-       Object* insert(ObjectFactory* fac, Edge edge, uint32_t flags) {
+       Object* insert(ObjectFactory* fac, Edge edge, uint32_t& flags) {
        /* use supplied functor to re-use an evicted object, or
         * allocate a new one of the descendant type */
        Object* o = evict_block();