Merge PR #19696 into master

* refs/pull/19696/head:
	client: avoid adding checked inode to the delayed_caps

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Zheng Yan <zyan@redhat.com>

diff --cc src/client/Client.cc
index 54c39335f385baf9a2ed9bdb0a11a9df2a6d061b,2d4a09ffa4a9ba21c3147c4e72c6edd62918c73e..7ecc4ff0ac46416d9f5ad62e0d7cfdf948267505
--- 1/src/client/Client.cc
--- 2/src/client/Client.cc
+++ b/src/client/Client.cc
@@@ -3201,10 -3200,10 +3201,10 @@@ int Client::get_caps_used(Inode *in
  
  void Client::cap_delay_requeue(Inode *in)
  {
-   ldout(cct, 10) << "cap_delay_requeue on " << *in << dendl;
+   ldout(cct, 10) << __func__ << " on " << *in << dendl;
    in->hold_caps_until = ceph_clock_now();
    in->hold_caps_until += cct->_conf->client_caps_release_delay;
 -  delayed_caps.push_back(&in->cap_item);
 +  delayed_list.push_back(&in->delay_cap_item);
  }
  
  void Client::send_cap(Inode *in, MetaSession *session, Cap *cap,