From: John Spray <jcspray@gmail.com>
Date: Tue, 4 Aug 2015 13:13:40 +0000 (+0100)
Subject: Merge pull request #4753 from ceph/wip-client-inode-refs
X-Git-Tag: v9.1.0~442
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=653dbecdfb9df92fe2cd181dc2d47a833c3f532d;p=ceph.git

Merge pull request #4753 from ceph/wip-client-inode-refs

client: hold reference for returned inode

Reviewed-by: John Spray <john.spray@redhat.com>
---

653dbecdfb9df92fe2cd181dc2d47a833c3f532d
diff --cc src/client/Inode.cc
index 69a8baa3eacf,219af9fdec0c..16eee7a7aa49
--- a/src/client/Inode.cc
+++ b/src/client/Inode.cc
@@@ -151,10 -152,10 +152,10 @@@ bool Inode::cap_is_valid(Cap* cap
      << "cap expire  " << cap->session->cap_ttl << std::endl
      << "cur time    " << ceph_clock_now(cct) << std::endl;*/
    if ((cap->session->cap_gen <= cap->gen)
-       && (ceph_clock_now(cct) < cap->session->cap_ttl)) {
+       && (ceph_clock_now(client->cct) < cap->session->cap_ttl)) {
      return true;
    }
 -  return true;
 +  return false;
  }
  
  int Inode::caps_issued(int *implemented)