mds: use const_iterator for decode

Signed-off-by: Kefu Chai <kchai@redhat.com>

src/mds/Anchor.cc

@@ -26,7 +26,7 @@ void Anchor::encode(bufferlist &bl) const
   ENCODE_FINISH(bl);
 }
 
-void Anchor::decode(bufferlist::iterator &bl)
+void Anchor::decode(bufferlist::const_iterator &bl)
 {
   DECODE_START(1, bl);
   decode(ino, bl);

src/mds/Anchor.h

@@ -40,7 +40,7 @@ class Anchor {
     ino(i), dirino(di), d_name(str), d_type(tp) {}
 
   void encode(bufferlist &bl) const;
-  void decode(bufferlist::iterator &bl);
+  void decode(bufferlist::const_iterator &bl);
   void dump(Formatter *f) const;
   static void generate_test_instances(list<Anchor*>& ls);
 };

src/mds/CDentry.cc

@@ -400,7 +400,7 @@ bool CDentry::is_freezing() const
   return dir->is_freezing();
 }
 
-void CDentry::decode_replica(bufferlist::iterator& p, bool is_new)
+void CDentry::decode_replica(bufferlist::const_iterator& p, bool is_new)
 {
   __u32 nonce;
   decode(nonce, p);
@@ -459,7 +459,7 @@ void CDentry::encode_lock_state(int type, bufferlist& bl)
 
 void CDentry::decode_lock_state(int type, bufferlist& bl)
 {  
-  bufferlist::iterator p = bl.begin();
+  auto p = bl.cbegin();
 
   snapid_t newfirst;
   decode(newfirst, p);

src/mds/CDentry.h

@@ -256,7 +256,7 @@ class CDentry : public MDSCacheObject, public LRUObject, public Counter<CDentry>
     lock.encode_state_for_replica(bl);
     encode(need_recover, bl);
   }
-  void decode_replica(bufferlist::iterator& p, bool is_new);
+  void decode_replica(bufferlist::const_iterator& p, bool is_new);
 
   // -- exporting
   // note: this assumes the dentry already exists.  
@@ -282,7 +282,7 @@ class CDentry : public MDSCacheObject, public LRUObject, public Counter<CDentry>
   void abort_export() {
     put(PIN_TEMPEXPORTING);
   }
-  void decode_import(bufferlist::iterator& blp, LogSegment *ls) {
+  void decode_import(bufferlist::const_iterator& blp, LogSegment *ls) {
     decode(first, blp);
     __u32 nstate;
     decode(nstate, blp);

src/mds/CDir.cc

@@ -1696,7 +1696,7 @@ CDentry *CDir::_load_dentry(
     const std::set<snapid_t> *snaps,
     bool *force_dirty)
 {
-  bufferlist::iterator q = bl.begin();
+  auto q = bl.cbegin();
 
   snapid_t first;
   decode(first, q);
@@ -1909,7 +1909,7 @@ void CDir::_omap_fetched(bufferlist& hdrbl, map<string, bufferlist>& omap,
 
   fnode_t got_fnode;
   {
-    bufferlist::iterator p = hdrbl.begin();
+    auto p = hdrbl.cbegin();
     try {
       decode(got_fnode, p);
     } catch (const buffer::error &err) {
@@ -2512,7 +2512,7 @@ void CDir::finish_export(utime_t now)
   dirty_old_rstat.clear();
 }
 
-void CDir::decode_import(bufferlist::iterator& blp, utime_t now, LogSegment *ls)
+void CDir::decode_import(bufferlist::const_iterator& blp, utime_t now, LogSegment *ls)
 {
   decode(first, blp);
   decode(fnode, blp);

src/mds/CDir.h

@@ -573,7 +573,7 @@ class CDir : public MDSCacheObject, public Counter<CDir> {
     encode(dir_rep, bl);
     encode(dir_rep_by, bl);
   }
-  void _decode_base(bufferlist::iterator& p) {
+  void _decode_base(bufferlist::const_iterator& p) {
     decode(first, p);
     decode(fnode, p);
     decode(dir_rep, p);
@@ -584,7 +584,7 @@ class CDir : public MDSCacheObject, public Counter<CDir> {
     encode(nonce, bl);
     _encode_base(bl);
   }
-  void decode_replica(bufferlist::iterator& p) {
+  void decode_replica(bufferlist::const_iterator& p) {
     __u32 nonce;
     decode(nonce, p);
     replica_nonce = nonce;
@@ -704,7 +704,7 @@ class CDir : public MDSCacheObject, public Counter<CDir> {
   void abort_export() {
     put(PIN_TEMPEXPORTING);
   }
-  void decode_import(bufferlist::iterator& blp, utime_t now, LogSegment *ls);
+  void decode_import(bufferlist::const_iterator& blp, utime_t now, LogSegment *ls);
   void abort_import(utime_t now);
 
   // -- auth pins --

src/mds/CInode.cc

@@ -1174,11 +1174,11 @@ void CInode::fetch(MDSInternalContextBase *fin)
 void CInode::_fetched(bufferlist& bl, bufferlist& bl2, Context *fin)
 {
   dout(10) << __func__ << " got " << bl.length() << " and " << bl2.length() << dendl;
-  bufferlist::iterator p;
+  bufferlist::const_iterator p;
   if (bl2.length()) {
-    p = bl2.begin();
+    p = bl2.cbegin();
   } else if (bl.length()) {
-    p = bl.begin();
+    p = bl.cbegin();
   } else {
     derr << "No data while reading inode " << ino() << dendl;
     fin->complete(-ENOENT);
@@ -1442,7 +1442,7 @@ void CInode::encode_store(bufferlist& bl, uint64_t features)
 			 &snap_blob);
 }
 
-void InodeStoreBase::decode_bare(bufferlist::iterator &bl,
+void InodeStoreBase::decode_bare(bufferlist::const_iterator &bl,
 			      bufferlist& snap_blob, __u8 struct_v)
 {
   using ceph::decode;
@@ -1480,14 +1480,14 @@ void InodeStoreBase::decode_bare(bufferlist::iterator &bl,
 }
 
 
-void InodeStoreBase::decode(bufferlist::iterator &bl, bufferlist& snap_blob)
+void InodeStoreBase::decode(bufferlist::const_iterator &bl, bufferlist& snap_blob)
 {
   DECODE_START_LEGACY_COMPAT_LEN(5, 4, 4, bl);
   decode_bare(bl, snap_blob, struct_v);
   DECODE_FINISH(bl);
 }
 
-void CInode::decode_store(bufferlist::iterator& bl)
+void CInode::decode_store(bufferlist::const_iterator& bl)
 {
   bufferlist snap_blob;
   InodeStoreBase::decode(bl, snap_blob);
@@ -1668,7 +1668,7 @@ void CInode::encode_lock_state(int type, bufferlist& bl)
 
 void CInode::decode_lock_state(int type, bufferlist& bl)
 {
-  bufferlist::iterator p = bl.begin();
+  auto p = bl.cbegin();
   utime_t tm;
 
   snapid_t newfirst;
@@ -2789,7 +2789,7 @@ void CInode::decode_snap_blob(bufferlist& snapbl)
   if (snapbl.length()) {
     open_snaprealm();
     auto old_flags = snaprealm->srnode.flags;
-    bufferlist::iterator p = snapbl.begin();
+    auto p = snapbl.cbegin();
     decode(snaprealm->srnode, p);
     if (is_base()) {
       bool ok = snaprealm->_open_parents(NULL);
@@ -2816,7 +2816,7 @@ void CInode::encode_snap(bufferlist& bl)
   encode(oldest_snap, bl);
 }
 
-void CInode::decode_snap(bufferlist::iterator& p)
+void CInode::decode_snap(bufferlist::const_iterator& p)
 {
   using ceph::decode;
   bufferlist snapbl;
@@ -3686,7 +3686,7 @@ void CInode::_encode_base(bufferlist& bl, uint64_t features)
   encode(damage_flags, bl);
   encode_snap(bl);
 }
-void CInode::_decode_base(bufferlist::iterator& p)
+void CInode::_decode_base(bufferlist::const_iterator& p)
 {
   using ceph::decode;
   decode(first, p);
@@ -3718,7 +3718,7 @@ void CInode::_encode_locks_full(bufferlist& bl)
 
   encode(loner_cap, bl);
 }
-void CInode::_decode_locks_full(bufferlist::iterator& p)
+void CInode::_decode_locks_full(bufferlist::const_iterator& p)
 {
   using ceph::decode;
   decode(authlock, p);
@@ -3764,7 +3764,7 @@ void CInode::_encode_locks_state_for_rejoin(bufferlist& bl, int rep)
   policylock.encode_state_for_replica(bl);
 }
 
-void CInode::_decode_locks_state(bufferlist::iterator& p, bool is_new)
+void CInode::_decode_locks_state(bufferlist::const_iterator& p, bool is_new)
 {
   authlock.decode_state(p, is_new);
   linklock.decode_state(p, is_new);
@@ -3793,7 +3793,7 @@ void CInode::_decode_locks_state(bufferlist::iterator& p, bool is_new)
     policylock.mark_need_recover();
   }
 }
-void CInode::_decode_locks_rejoin(bufferlist::iterator& p, list<MDSInternalContextBase*>& waiters,
+void CInode::_decode_locks_rejoin(bufferlist::const_iterator& p, list<MDSInternalContextBase*>& waiters,
 				  list<SimpleLock*>& eval_locks, bool survivor)
 {
   authlock.decode_state_rejoin(p, waiters, survivor);
@@ -3867,7 +3867,7 @@ void CInode::finish_export(utime_t now)
   put(PIN_TEMPEXPORTING);
 }
 
-void CInode::decode_import(bufferlist::iterator& p,
+void CInode::decode_import(bufferlist::const_iterator& p,
 			   LogSegment *ls)
 {
   DECODE_START(5, p);
@@ -3897,7 +3897,7 @@ void CInode::decode_import(bufferlist::iterator& p,
   // decode fragstat info on bounding cdirs
   bufferlist bounding;
   decode(bounding, p);
-  bufferlist::iterator q = bounding.begin();
+  auto q = bounding.cbegin();
   while (!q.end()) {
     frag_t fg;
     decode(fg, q);
@@ -4101,7 +4101,7 @@ void CInode::validate_disk_state(CInode::validated_data *results,
 
       // extract the backtrace, and compare it to a newly-constructed one
       try {
-        bufferlist::iterator p = bl.begin();
+        auto p = bl.cbegin();
 	using ceph::decode;
         decode(results->backtrace.ondisk_value, p);
         dout(10) << "decoded " << bl.length() << " bytes of backtrace successfully" << dendl;

src/mds/CInode.h

@@ -98,11 +98,11 @@ class InodeStoreBase {
 
   /* Full serialization for use in ".inode" root inode objects */
   void encode(bufferlist &bl, uint64_t features, const bufferlist *snap_blob=NULL) const;
-  void decode(bufferlist::iterator &bl, bufferlist& snap_blob);
+  void decode(bufferlist::const_iterator &bl, bufferlist& snap_blob);
 
   /* Serialization without ENCODE_START/FINISH blocks for use embedded in dentry */
   void encode_bare(bufferlist &bl, uint64_t features, const bufferlist *snap_blob=NULL) const;
-  void decode_bare(bufferlist::iterator &bl, bufferlist &snap_blob, __u8 struct_v=5);
+  void decode_bare(bufferlist::const_iterator &bl, bufferlist &snap_blob, __u8 struct_v=5);
 
   /* For test/debug output */
   void dump(Formatter *f) const;
@@ -120,13 +120,13 @@ class InodeStore : public InodeStoreBase {
   void encode(bufferlist &bl, uint64_t features) const {
     InodeStoreBase::encode(bl, features, &snap_blob);
   }
-  void decode(bufferlist::iterator &bl) {
+  void decode(bufferlist::const_iterator &bl) {
     InodeStoreBase::decode(bl, snap_blob);
   }
   void encode_bare(bufferlist &bl, uint64_t features) const {
     InodeStoreBase::encode_bare(bl, features, &snap_blob);
   }
-  void decode_bare(bufferlist::iterator &bl) {
+  void decode_bare(bufferlist::const_iterator &bl) {
     InodeStoreBase::decode_bare(bl, snap_blob);
   }
 
@@ -140,7 +140,7 @@ class InodeStoreBare : public InodeStore {
   void encode(bufferlist &bl, uint64_t features) const {
     InodeStore::encode_bare(bl, features);
   }
-  void decode(bufferlist::iterator &bl) {
+  void decode(bufferlist::const_iterator &bl) {
     InodeStore::decode_bare(bl);
   }
   static void generate_test_instances(std::list<InodeStoreBare*>& ls);
@@ -633,7 +633,7 @@ class CInode : public MDSCacheObject, public InodeStoreBase, public Counter<CIno
     if (has_flock_locks)
       encode(*flock_locks, bl);
   }
-  void _decode_file_locks(bufferlist::iterator& p) {
+  void _decode_file_locks(bufferlist::const_iterator& p) {
     using ceph::decode;
     bool has_fcntl_locks;
     decode(has_fcntl_locks, p);
@@ -816,7 +816,7 @@ class CInode : public MDSCacheObject, public InodeStoreBase, public Counter<CIno
   void encode_snap_blob(bufferlist &bl);
   void decode_snap_blob(bufferlist &bl);
   void encode_store(bufferlist& bl, uint64_t features);
-  void decode_store(bufferlist::iterator& bl);
+  void decode_store(bufferlist::const_iterator& bl);
 
   void encode_replica(mds_rank_t rep, bufferlist& bl, uint64_t features, bool need_recover) {
     assert(is_auth());
@@ -832,7 +832,7 @@ class CInode : public MDSCacheObject, public InodeStoreBase, public Counter<CIno
     _encode_base(bl, features);
     _encode_locks_state_for_replica(bl, need_recover);
   }
-  void decode_replica(bufferlist::iterator& p, bool is_new) {
+  void decode_replica(bufferlist::const_iterator& p, bool is_new) {
     using ceph::decode;
     __u32 nonce;
     decode(nonce, p);
@@ -856,13 +856,13 @@ class CInode : public MDSCacheObject, public InodeStoreBase, public Counter<CIno
 
   // -- encode/decode helpers --
   void _encode_base(bufferlist& bl, uint64_t features);
-  void _decode_base(bufferlist::iterator& p);
+  void _decode_base(bufferlist::const_iterator& p);
   void _encode_locks_full(bufferlist& bl);
-  void _decode_locks_full(bufferlist::iterator& p);
+  void _decode_locks_full(bufferlist::const_iterator& p);
   void _encode_locks_state_for_replica(bufferlist& bl, bool need_recover);
   void _encode_locks_state_for_rejoin(bufferlist& bl, int rep);
-  void _decode_locks_state(bufferlist::iterator& p, bool is_new);
-  void _decode_locks_rejoin(bufferlist::iterator& p, std::list<MDSInternalContextBase*>& waiters,
+  void _decode_locks_state(bufferlist::const_iterator& p, bool is_new);
+  void _decode_locks_rejoin(bufferlist::const_iterator& p, std::list<MDSInternalContextBase*>& waiters,
 			    std::list<SimpleLock*>& eval_locks, bool survivor);
 
   // -- import/export --
@@ -874,7 +874,7 @@ class CInode : public MDSCacheObject, public InodeStoreBase, public Counter<CIno
     state_clear(STATE_EXPORTINGCAPS);
     put(PIN_EXPORTINGCAPS);
   }
-  void decode_import(bufferlist::iterator& p, LogSegment *ls);
+  void decode_import(bufferlist::const_iterator& p, LogSegment *ls);
 
 
   // for giving to clients
@@ -945,7 +945,7 @@ class CInode : public MDSCacheObject, public InodeStoreBase, public Counter<CIno
   void close_snaprealm(bool no_join=false);
   SnapRealm *find_snaprealm() const;
   void encode_snap(bufferlist& bl);
-  void decode_snap(bufferlist::iterator& p);
+  void decode_snap(bufferlist::const_iterator& p);
 
   // -- caps -- (new)
   // client caps

src/mds/Capability.cc

@@ -36,7 +36,7 @@ void Capability::Export::encode(bufferlist &bl) const
   ENCODE_FINISH(bl);
 }
 
-void Capability::Export::decode(bufferlist::iterator &p)
+void Capability::Export::decode(bufferlist::const_iterator &p)
 {
   DECODE_START_LEGACY_COMPAT_LEN(2, 2, 2, p);
   decode(cap_id, p);
@@ -83,7 +83,7 @@ void Capability::Import::encode(bufferlist &bl) const
   ENCODE_FINISH(bl);
 }
 
-void Capability::Import::decode(bufferlist::iterator &bl)
+void Capability::Import::decode(bufferlist::const_iterator &bl)
 {
   DECODE_START(1, bl);
   decode(cap_id, bl);
@@ -112,7 +112,7 @@ void Capability::revoke_info::encode(bufferlist& bl) const
   ENCODE_FINISH(bl);
 }
 
-void Capability::revoke_info::decode(bufferlist::iterator& bl)
+void Capability::revoke_info::decode(bufferlist::const_iterator& bl)
 {
   DECODE_START_LEGACY_COMPAT_LEN(2, 2, 2, bl);
   decode(before, bl);
@@ -165,7 +165,7 @@ void Capability::encode(bufferlist& bl) const
   ENCODE_FINISH(bl);
 }
 
-void Capability::decode(bufferlist::iterator &bl)
+void Capability::decode(bufferlist::const_iterator &bl)
 {
   DECODE_START_LEGACY_COMPAT_LEN(2, 2, 2, bl)
   decode(last_sent, bl);