update sources to ceph Nautilus 14.2.1

[ceph.git] / ceph / src / os / filestore / IndexManager.cc

diff --git a/ceph/src/os/filestore/IndexManager.cc b/ceph/src/os/filestore/IndexManager.cc
index 74cc454ffd8b120a1c38a459c2c04a45f69ff112..730950264cac2bb9eab546b01008a8d0e26bd370 100644 (file)
--- a/ceph/src/os/filestore/IndexManager.cc
+++ b/ceph/src/os/filestore/IndexManager.cc
@@ -12,7 +12,6 @@
  *
  */
 
-#include "include/memory.h"
 #include "include/unordered_map.h"
 
 #if defined(__FreeBSD__)
@@ -35,7 +34,7 @@
 
 static int set_version(const char *path, uint32_t version) {
   bufferlist bl;
-  ::encode(version, bl);
+  encode(version, bl);
   return chain_setxattr<true, true>(
     path, "user.cephos.collection_version", bl.c_str(),
     bl.length());
@@ -56,8 +55,8 @@ static int get_version(const char *path, uint32_t *version) {
   bp.set_length(r);
   bufferlist bl;
   bl.push_back(bp);
-  bufferlist::iterator i = bl.begin();
-  ::decode(*version, i);
+  auto i = bl.cbegin();
+  decode(*version, i);
   return 0;
 }