From: Patrick Donnelly <pdonnell@redhat.com>
Date: Wed, 10 Jan 2018 00:56:13 +0000 (-0800)
Subject: Merge PR #19696 into master
X-Git-Tag: v13.0.2~587
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8b24b57b62025ac7d951e020e362497cde86f5c4;p=ceph.git

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>
---

8b24b57b62025ac7d951e020e362497cde86f5c4
diff --cc src/client/Client.cc
index 54c39335f385,2d4a09ffa4a9..7ecc4ff0ac46
--- a/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,