update sources to v12.2.3

[ceph.git] / ceph / src / mds / CDentry.h

diff --git a/ceph/src/mds/CDentry.h b/ceph/src/mds/CDentry.h
index e9416104ad15f1fc81723729cfa940f922414231..1ccc40a66b09d5ad2383db5d98a6099c75c87a93 100644 (file)
--- a/ceph/src/mds/CDentry.h
+++ b/ceph/src/mds/CDentry.h
@@ -244,7 +244,7 @@ public:
   void clear_new() { state_clear(STATE_NEW); }
   
   // -- replication
-  void encode_replica(mds_rank_t mds, bufferlist& bl) {
+  void encode_replica(mds_rank_t mds, bufferlist& bl, bool need_recover) {
     if (!is_replicated())
       lock.replicate_relax();
 
@@ -253,8 +253,8 @@ public:
     ::encode(first, bl);
     ::encode(linkage.remote_ino, bl);
     ::encode(linkage.remote_d_type, bl);
-    __s32 ls = lock.get_replica_state();
-    ::encode(ls, bl);
+    lock.encode_state_for_replica(bl);
+    ::encode(need_recover, bl);
   }
   void decode_replica(bufferlist::iterator& p, bool is_new);
 
@@ -347,7 +347,7 @@ public:
   __u32 hash;
   snapid_t first, last;
 
-  elist<CDentry*>::item item_dirty;
+  elist<CDentry*>::item item_dirty, item_dir_dirty;
   elist<CDentry*>::item item_stray;
 
   // lock