update sources to ceph Nautilus 14.2.1

[ceph.git] / ceph / src / mds / inode_backtrace.cc

diff --git a/ceph/src/mds/inode_backtrace.cc b/ceph/src/mds/inode_backtrace.cc
index 314f1751b5e0ef7381e888edac1acc9c0f39638d..50e986a10d91871434584bd18c2ab63cb417a729 100644 (file)
--- a/ceph/src/mds/inode_backtrace.cc
+++ b/ceph/src/mds/inode_backtrace.cc
@@ -10,26 +10,27 @@
 void inode_backpointer_t::encode(bufferlist& bl) const
 {
   ENCODE_START(2, 2, bl);
-  ::encode(dirino, bl);
-  ::encode(dname, bl);
-  ::encode(version, bl);
+  encode(dirino, bl);
+  encode(dname, bl);
+  encode(version, bl);
   ENCODE_FINISH(bl);
 }
 
-void inode_backpointer_t::decode(bufferlist::iterator& bl)
+void inode_backpointer_t::decode(bufferlist::const_iterator& bl)
 {
   DECODE_START_LEGACY_COMPAT_LEN(2, 2, 2, bl);
-  ::decode(dirino, bl);
-  ::decode(dname, bl);
-  ::decode(version, bl);
+  decode(dirino, bl);
+  decode(dname, bl);
+  decode(version, bl);
   DECODE_FINISH(bl);
 }
 
-void inode_backpointer_t::decode_old(bufferlist::iterator& bl)
+void inode_backpointer_t::decode_old(bufferlist::const_iterator& bl)
 {
-  ::decode(dirino, bl);
-  ::decode(dname, bl);
-  ::decode(version, bl);
+  using ceph::decode;
+  decode(dirino, bl);
+  decode(dname, bl);
+  decode(version, bl);
 }
 
 void inode_backpointer_t::dump(Formatter *f) const
@@ -56,32 +57,32 @@ void inode_backpointer_t::generate_test_instances(list<inode_backpointer_t*>& ls
 void inode_backtrace_t::encode(bufferlist& bl) const
 {
   ENCODE_START(5, 4, bl);
-  ::encode(ino, bl);
-  ::encode(ancestors, bl);
-  ::encode(pool, bl);
-  ::encode(old_pools, bl);
+  encode(ino, bl);
+  encode(ancestors, bl);
+  encode(pool, bl);
+  encode(old_pools, bl);
   ENCODE_FINISH(bl);
 }
 
-void inode_backtrace_t::decode(bufferlist::iterator& bl)
+void inode_backtrace_t::decode(bufferlist::const_iterator& bl)
 {
   DECODE_START_LEGACY_COMPAT_LEN(5, 4, 4, bl);
   if (struct_v < 3)
     return;  // sorry, the old data was crap
-  ::decode(ino, bl);
+  decode(ino, bl);
   if (struct_v >= 4) {
-    ::decode(ancestors, bl);
+    decode(ancestors, bl);
   } else {
     __u32 n;
-    ::decode(n, bl);
+    decode(n, bl);
     while (n--) {
       ancestors.push_back(inode_backpointer_t());
       ancestors.back().decode_old(bl);
     }
   }
   if (struct_v >= 5) {
-    ::decode(pool, bl);
-    ::decode(old_pools, bl);
+    decode(pool, bl);
+    decode(old_pools, bl);
   }
   DECODE_FINISH(bl);
 }
@@ -121,7 +122,7 @@ void inode_backtrace_t::generate_test_instances(list<inode_backtrace_t*>& ls)
 int inode_backtrace_t::compare(const inode_backtrace_t& other,
                                bool *equivalent, bool *divergent) const
 {
-  int min_size = MIN(ancestors.size(),other.ancestors.size());
+  int min_size = std::min(ancestors.size(),other.ancestors.size());
   *equivalent = true;
   *divergent = false;
   if (min_size == 0)