]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #52623 into main
authorVenky Shankar <vshankar@redhat.com>
Mon, 30 Sep 2024 06:58:05 +0000 (12:28 +0530)
committerVenky Shankar <vshankar@redhat.com>
Mon, 30 Sep 2024 06:58:05 +0000 (12:28 +0530)
* refs/pull/52623/head:
ceph-dencoder: MDS - Add missing types

Reviewed-by: Venky Shankar <vshankar@redhat.com>
1  2 
src/include/cephfs/types.h
src/mds/Capability.cc
src/mds/Capability.h
src/mds/FSMap.cc
src/mds/FSMap.h
src/mds/PurgeQueue.cc
src/mds/SessionMap.h
src/mds/mdstypes.cc
src/mds/mdstypes.h
src/messages/MMDSBeacon.h

Simple merge
Simple merge
Simple merge
Simple merge
diff --cc src/mds/FSMap.h
Simple merge
Simple merge
Simple merge
Simple merge
index 17a5bf7acae788c493759e0ae65e912acdf3cb2b,347b697ea56b640d1daa0f9178d849356245b869..3b8269006cb783be67d7d3a72db6c8b6eab2220a
@@@ -349,9 -348,8 +349,10 @@@ public
    void decode(ceph::buffer::list::const_iterator &p);
    void dump(ceph::Formatter *f) const;
    void print(std::ostream& out) const;
+   static void generate_test_instances(std::list<feature_bitset_t*>& ls);
  private:
 +  void init_array(const std::vector<size_t>& v);
 +
    std::vector<block_type> _vec;
  };
  WRITE_CLASS_ENCODER(feature_bitset_t)
Simple merge