]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #22015 from tchaikov/wip-denc
authorKefu Chai <tchaikov@gmail.com>
Thu, 17 May 2018 16:56:08 +0000 (00:56 +0800)
committerGitHub <noreply@github.com>
Thu, 17 May 2018 16:56:08 +0000 (00:56 +0800)
buffer,denc: use ptr::const_iterator for decode

Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
16 files changed:
1  2 
src/librbd/internal.cc
src/mds/FSMap.cc
src/mds/FSMap.h
src/mds/MDSDaemon.cc
src/mds/MDSMap.cc
src/mds/MDSMap.h
src/mon/MDSMonitor.cc
src/mon/MonClient.cc
src/msg/async/AsyncConnection.cc
src/os/bluestore/BlueFS.cc
src/os/bluestore/BlueStore.cc
src/os/filestore/FileStore.cc
src/osd/PG.cc
src/osd/osd_types.h
src/tools/rbd/Utils.cc
src/tools/rbd_mirror/ImageReplayer.cc

Simple merge
Simple merge
diff --cc src/mds/FSMap.h
index 5eaf1c320fe7205628d56ee6d4dd39e3d79d2799,050ed114b50acd9b94ec6e7974455174a8bfc3c8..047573cc7c49c3cb26aecce54b68de4e3044bcac
@@@ -47,8 -47,14 +47,8 @@@ class health_check_map_t
  class Filesystem
  {
  public:
 -  Filesystem()
 -    :
 -      fscid(FS_CLUSTER_ID_NONE)
 -  {
 -  }
 -
    void encode(bufferlist& bl, uint64_t features) const;
-   void decode(bufferlist::iterator& p);
+   void decode(bufferlist::const_iterator& p);
  
    void dump(Formatter *f) const;
    void print(std::ostream& out) const;
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc src/osd/PG.cc
Simple merge
Simple merge
Simple merge
Simple merge