update sources to ceph Nautilus 14.2.1

[ceph.git] / ceph / src / mds / events / EFragment.h

diff --git a/ceph/src/mds/events/EFragment.h b/ceph/src/mds/events/EFragment.h
index 2ebf0812df57b1e0d9f5def2fa3e6437f09129b8..90d9238b030f6f7ca8571907f6fdd33b285da68c 100644 (file)
--- a/ceph/src/mds/events/EFragment.h
+++ b/ceph/src/mds/events/EFragment.h
@@ -22,7 +22,7 @@ struct dirfrag_rollback {
   fnode_t fnode;
   dirfrag_rollback() { }
   void encode(bufferlist& bl) const;
-  void decode(bufferlist::iterator& bl);
+  void decode(bufferlist::const_iterator& bl);
 };
 WRITE_CLASS_ENCODER(dirfrag_rollback)
 
@@ -33,12 +33,12 @@ public:
   inodeno_t ino;
   frag_t basefrag;
   __s32 bits{0};         // positive for split (from basefrag), negative for merge (to basefrag)
-  list<frag_t> orig_frags;
+  frag_vec_t orig_frags;
   bufferlist rollback;
 
   EFragment() : LogEvent(EVENT_FRAGMENT) { }
   EFragment(MDLog *mdlog, int o, dirfrag_t df, int b) :
-    LogEvent(EVENT_FRAGMENT), metablob(mdlog), 
+    LogEvent(EVENT_FRAGMENT),
     op(o), ino(df.ino), basefrag(df.frag), bits(b) { }
 
   void print(ostream& out) const override {
@@ -51,7 +51,7 @@ public:
     OP_ROLLBACK = 3,
     OP_FINISH = 4 // finish deleting orphan dirfrags
   };
-  static const char *op_name(int o) {
+  static std::string_view op_name(int o) {
     switch (o) {
     case OP_PREPARE: return "prepare";
     case OP_COMMIT: return "commit";
@@ -62,15 +62,16 @@ public:
   }
 
   void add_orig_frag(frag_t df, dirfrag_rollback *drb=NULL) {
+    using ceph::encode;
     orig_frags.push_back(df);
     if (drb)
-      ::encode(*drb, rollback);
+      encode(*drb, rollback);
   }
 
   EMetaBlob *get_metablob() override { return &metablob; }
 
   void encode(bufferlist &bl, uint64_t features) const override;
-  void decode(bufferlist::iterator &bl) override;
+  void decode(bufferlist::const_iterator &bl) override;
   void dump(Formatter *f) const override;
   static void generate_test_instances(list<EFragment*>& ls);
   void replay(MDSRank *mds) override;