From: Kefu Chai <tchaikov@gmail.com>
Date: Thu, 29 Nov 2018 09:10:25 +0000 (+0800)
Subject: Merge pull request #25264 from tchaikov/wip-mds-mem-frag
X-Git-Tag: v14.1.0~772
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f53b8932720173c009ae536407c769822d38db4c;p=ceph.git

Merge pull request #25264 from tchaikov/wip-mds-mem-frag

denc: fix internal fragmentation when decoding ptr in bl

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

f53b8932720173c009ae536407c769822d38db4c
diff --cc src/include/buffer.h
index a012245b7862,a984cea4946e..123ff4c2a52e
--- a/src/include/buffer.h
+++ b/src/include/buffer.h
@@@ -407,10 -406,16 +406,16 @@@ namespace buffer CEPH_BUFFER_API 
        typedef typename std::conditional<is_const,
  					typename std::list<ptr>::const_iterator,
  					typename std::list<ptr>::iterator>::type list_iter_t;
+       using iterator_category = std::forward_iterator_tag;
+       using value_type = typename std::conditional<is_const, const char, char>::type;
+       using difference_type = std::ptrdiff_t;
+       using pointer = typename std::add_pointer<value_type>::type;
+       using reference = typename std::add_lvalue_reference<value_type>::type;
+ 
        bl_t* bl;
        list_t* ls;  // meh.. just here to avoid an extra pointer dereference..
 -      unsigned off; // in bl
        list_iter_t p;
 +      unsigned off; // in bl
        unsigned p_off;   // in *p
        friend class iterator_impl<true>;