Merge PR #22045 into master

* refs/pull/22045/head:
	client: cleanup Cap init

Reviewed-by: Sage Weil <sage@redhat.com>

diff --cc src/client/Client.cc
index 832070dac64804c138116596b4ca06e1b7c27c2d,56fc4564646d1e1f092e33cd4e13e463c495dddc..0c45980d3fa7e65f9df54d2b2e39867738d8c77b
--- 1/src/client/Client.cc
--- 2/src/client/Client.cc
+++ b/src/client/Client.cc
@@@ -4089,11 -4086,10 +4086,11 @@@ void Client::trim_caps(MetaSession *s, 
  
    uint64_t trimmed = 0;
    auto p = s->caps.begin();
 -  std::set<InodeRef> anchor; /* prevent put_inode from deleting all caps during traversal */
 +  std::set<Dentry *> to_trim; /* this avoids caps other than the one we're
 +                               * looking at from getting deleted during traversal. */
    while ((caps_size - trimmed) > max && !p.end()) {
      Cap *cap = *p;
-     InodeRef in(cap->inode);
+     InodeRef in(&cap->inode);
  
      // Increment p early because it will be invalidated if cap
      // is deleted inside remove_cap