From: Sage Weil <sage@newdream.net>
Date: Tue, 11 May 2010 20:20:49 +0000 (-0700)
Subject: mds: remove size, mtime, atime from cap reconnect
X-Git-Tag: v0.22~346^2~42
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6be6c48edbdf8bf1950f28e22c153a913604c1fe;p=ceph.git

mds: remove size, mtime, atime from cap reconnect
---

diff --git a/src/client/Client.cc b/src/client/Client.cc
index 3e39828180d5..e646878a2a5b 100644
--- a/src/client/Client.cc
+++ b/src/client/Client.cc
@@ -1420,7 +1420,7 @@ void Client::send_reconnect(int mds)
 		 path.get_ino(), path.get_path(),   // ino
 		 in->caps_wanted(), // wanted
 		 in->caps[mds]->issued,     // issued
-		 in->size, in->mtime, in->atime, in->snaprealm->ino);
+		 in->snaprealm->ino);
 
       if (did_snaprealm.count(in->snaprealm->ino) == 0) {
 	dout(10) << " snaprealm " << *in->snaprealm << dendl;
diff --git a/src/mds/CInode.h b/src/mds/CInode.h
index e1aec5ee30b3..2ecb5b850fb7 100644
--- a/src/mds/CInode.h
+++ b/src/mds/CInode.h
@@ -701,9 +701,6 @@ public:
     }
     cap->set_cap_id(icr.cap_id);
     cap->set_last_issue_stamp(g_clock.recent_now());
-    inode.size = MAX(inode.size, icr.size);
-    inode.mtime = MAX(inode.mtime, utime_t(icr.mtime));
-    inode.atime = MAX(inode.atime, utime_t(icr.atime));
     return cap;
   }
   void clear_client_caps_after_export() {
diff --git a/src/mds/mdstypes.h b/src/mds/mdstypes.h
index ad24f1e6a5bd..e41c5ffe8c58 100644
--- a/src/mds/mdstypes.h
+++ b/src/mds/mdstypes.h
@@ -732,14 +732,11 @@ struct cap_reconnect_t {
   ceph_mds_cap_reconnect capinfo;
 
   cap_reconnect_t() {}
-  cap_reconnect_t(uint64_t cap_id, inodeno_t pino, const string& p, int w, int i, uint64_t sz, utime_t mt, utime_t at, inodeno_t sr) : 
+  cap_reconnect_t(uint64_t cap_id, inodeno_t pino, const string& p, int w, int i, inodeno_t sr) : 
     path(p) {
     capinfo.cap_id = cap_id;
     capinfo.wanted = w;
     capinfo.issued = i;
-    capinfo.size = sz;
-    capinfo.mtime = mt;
-    capinfo.atime = at;
     capinfo.snaprealm = sr;
     capinfo.pathbase = pino;
   }
diff --git a/src/messages/MClientReconnect.h b/src/messages/MClientReconnect.h
index eda623942c84..be2472400893 100644
--- a/src/messages/MClientReconnect.h
+++ b/src/messages/MClientReconnect.h
@@ -36,9 +36,8 @@ public:
 
   void add_cap(inodeno_t ino, uint64_t cap_id, inodeno_t pathbase, const string& path,
 	       int wanted, int issued,
-	       loff_t sz, utime_t mt, utime_t at,
 	       inodeno_t sr) {
-    caps[ino] = cap_reconnect_t(cap_id, pathbase, path, wanted, issued, sz, mt, at, sr);
+    caps[ino] = cap_reconnect_t(cap_id, pathbase, path, wanted, issued, sr);
   }
   void add_snaprealm(inodeno_t ino, snapid_t seq, inodeno_t parent) {
     ceph_mds_snaprealm_reconnect r;