From: Kefu Chai <tchaikov@gmail.com>
Date: Thu, 17 May 2018 16:56:08 +0000 (+0800)
Subject: Merge pull request #22015 from tchaikov/wip-denc
X-Git-Tag: v14.0.0~97
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2a724a2ff313701fd7f6278ce8ed7f440bb355e0;p=ceph.git

Merge pull request #22015 from tchaikov/wip-denc

buffer,denc: use ptr::const_iterator for decode

Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
---

2a724a2ff313701fd7f6278ce8ed7f440bb355e0
diff --cc src/mds/FSMap.h
index 5eaf1c320fe,050ed114b50..047573cc7c4
--- a/src/mds/FSMap.h
+++ b/src/mds/FSMap.h
@@@ -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;