From: Sage Weil <sage@inktank.com>
Date: Tue, 20 May 2014 22:00:37 +0000 (-0700)
Subject: mds: use real timestamp for readdir leases
X-Git-Tag: v0.82~57^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a09547bbfc5627da915fe388f119cd96a63b2003;p=ceph.git

mds: use real timestamp for readdir leases

Signed-off-by: Sage Weil <sage@inktank.com>
---

diff --git a/src/mds/Server.cc b/src/mds/Server.cc
index 1b5c92578463..116971bac7e9 100644
--- a/src/mds/Server.cc
+++ b/src/mds/Server.cc
@@ -2885,6 +2885,7 @@ void Server::handle_client_readdir(MDRequestRef& mdr)
   dir->verify_fragstat();
 #endif
 
+  utime_t now = ceph_clock_now(NULL);
   mdr->now = ceph_clock_now(g_ceph_context);
 
   snapid_t snapid = mdr->snapid;
@@ -2993,7 +2994,7 @@ void Server::handle_client_readdir(MDRequestRef& mdr)
     // dentry
     dout(12) << "including    dn " << *dn << dendl;
     ::encode(dn->name, dnbl);
-    mds->locker->issue_client_lease(dn, client, dnbl, mdr->now, mdr->session);
+    mds->locker->issue_client_lease(dn, client, dnbl, now, mdr->session);
 
     // inode
     dout(12) << "including inode " << *in << dendl;