]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #4753 from ceph/wip-client-inode-refs
authorJohn Spray <jcspray@gmail.com>
Tue, 4 Aug 2015 13:13:40 +0000 (14:13 +0100)
committerJohn Spray <jcspray@gmail.com>
Tue, 4 Aug 2015 13:13:40 +0000 (14:13 +0100)
client: hold reference for returned inode

Reviewed-by: John Spray <john.spray@redhat.com>
1  2 
src/client/Inode.cc

index 69a8baa3eacfbd518ac5c9501c9ec819b07a7d3d,219af9fdec0c9065541e57fcb783027578010604..16eee7a7aa494b41fac535a469ae3dc49fce923d
@@@ -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)