From: Sage Weil <sage@newdream.net>
Date: Mon, 26 May 2008 19:35:17 +0000 (-0700)
Subject: mds: fix up filelock state encoders to include time_warp_seq, max_size
X-Git-Tag: v0.3~170^2~57
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=fdec4c44606ad06e19f32a3d48440a896759fd75;p=ceph.git

mds: fix up filelock state encoders to include time_warp_seq, max_size
---

diff --git a/src/mds/CInode.cc b/src/mds/CInode.cc
index 453b8059cb8c..c40caa36f562 100644
--- a/src/mds/CInode.cc
+++ b/src/mds/CInode.cc
@@ -521,8 +521,10 @@ void CInode::encode_lock_state(int type, bufferlist& bl)
     
   case CEPH_LOCK_IFILE:
     ::encode(inode.size, bl);
+    ::encode(inode.max_size, bl);
     ::encode(inode.mtime, bl);
     ::encode(inode.atime, bl);
+    ::encode(inode.time_warp_seq, bl);
     break;
 
   case CEPH_LOCK_IDIR:
@@ -594,8 +596,10 @@ void CInode::decode_lock_state(int type, bufferlist& bl)
 
   case CEPH_LOCK_IFILE:
     ::decode(inode.size, p);
+    ::decode(inode.max_size, p);
     ::decode(inode.mtime, p);
     ::decode(inode.atime, p);
+    ::decode(inode.time_warp_seq, p);
     break;
 
   case CEPH_LOCK_IDIR:
diff --git a/src/mds/Locker.cc b/src/mds/Locker.cc
index ed2cebdf5c0c..8102751b62a0 100644
--- a/src/mds/Locker.cc
+++ b/src/mds/Locker.cc
@@ -1241,7 +1241,7 @@ void Locker::predirty_nested(Mutation *mut, EMetaBlob *blob,
   list<CInode*> lsi;
   CInode *cur = in;
   while (parent) {
-    assert(cur->is_auth() || !primary_dn);
+    //assert(cur->is_auth() || !primary_dn);  // this breaks the rename auth twiddle hack
     assert(parent->is_auth());
     
     // opportunistically adjust parent dirfrag