From fdec4c44606ad06e19f32a3d48440a896759fd75 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Mon, 26 May 2008 12:35:17 -0700 Subject: [PATCH] mds: fix up filelock state encoders to include time_warp_seq, max_size --- src/mds/CInode.cc | 4 ++++ src/mds/Locker.cc | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/mds/CInode.cc b/src/mds/CInode.cc index 453b8059cb8c5..c40caa36f5622 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 ed2cebdf5c0cd..8102751b62a07 100644 --- a/src/mds/Locker.cc +++ b/src/mds/Locker.cc @@ -1241,7 +1241,7 @@ void Locker::predirty_nested(Mutation *mut, EMetaBlob *blob, list 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 -- 2.39.5