update sources to ceph Nautilus 14.2.1

[ceph.git] / ceph / src / cls / lock / cls_lock_ops.h

diff --git a/ceph/src/cls/lock/cls_lock_ops.h b/ceph/src/cls/lock/cls_lock_ops.h
index b9388e78877c73ddc61801f069ce9f8505c57f49..5d22452b3b2554d6a7ce02cc188b68aa08fcc2f0 100644 (file)
--- a/ceph/src/cls/lock/cls_lock_ops.h
+++ b/ceph/src/cls/lock/cls_lock_ops.h
@@ -22,27 +22,27 @@ struct cls_lock_lock_op
 
   void encode(bufferlist &bl) const {
     ENCODE_START(1, 1, bl);
-    ::encode(name, bl);
+    encode(name, bl);
     uint8_t t = (uint8_t)type;
-    ::encode(t, bl);
-    ::encode(cookie, bl);
-    ::encode(tag, bl);
-    ::encode(description, bl);
-    ::encode(duration, bl);
-    ::encode(flags, bl);
+    encode(t, bl);
+    encode(cookie, bl);
+    encode(tag, bl);
+    encode(description, bl);
+    encode(duration, bl);
+    encode(flags, bl);
     ENCODE_FINISH(bl);
   }
-  void decode(bufferlist::iterator &bl) {
+  void decode(bufferlist::const_iterator &bl) {
     DECODE_START_LEGACY_COMPAT_LEN(1, 1, 1, bl);
-    ::decode(name, bl);
+    decode(name, bl);
     uint8_t t;
-    ::decode(t, bl);
+    decode(t, bl);
     type = (ClsLockType)t;
-    ::decode(cookie, bl);
-    ::decode(tag, bl);
-    ::decode(description, bl);
-    ::decode(duration, bl);
-    ::decode(flags, bl);
+    decode(cookie, bl);
+    decode(tag, bl);
+    decode(description, bl);
+    decode(duration, bl);
+    decode(flags, bl);
     DECODE_FINISH(bl);
   }
   void dump(Formatter *f) const;
@@ -59,14 +59,14 @@ struct cls_lock_unlock_op
 
   void encode(bufferlist &bl) const {
     ENCODE_START(1, 1, bl);
-    ::encode(name, bl);
-    ::encode(cookie, bl);
+    encode(name, bl);
+    encode(cookie, bl);
     ENCODE_FINISH(bl);
   }
-  void decode(bufferlist::iterator &bl) {
+  void decode(bufferlist::const_iterator &bl) {
     DECODE_START_LEGACY_COMPAT_LEN(1, 1, 1, bl);
-    ::decode(name, bl);
-    ::decode(cookie, bl);
+    decode(name, bl);
+    decode(cookie, bl);
     DECODE_FINISH(bl);
   }
   void dump(Formatter *f) const;
@@ -84,16 +84,16 @@ struct cls_lock_break_op
 
   void encode(bufferlist &bl) const {
     ENCODE_START(1, 1, bl);
-    ::encode(name, bl);
-    ::encode(locker, bl);
-    ::encode(cookie, bl);
+    encode(name, bl);
+    encode(locker, bl);
+    encode(cookie, bl);
     ENCODE_FINISH(bl);
   }
-  void decode(bufferlist::iterator &bl) {
+  void decode(bufferlist::const_iterator &bl) {
     DECODE_START_LEGACY_COMPAT_LEN(1, 1, 1, bl);
-    ::decode(name, bl);
-    ::decode(locker, bl);
-    ::decode(cookie, bl);
+    decode(name, bl);
+    decode(locker, bl);
+    decode(cookie, bl);
     DECODE_FINISH(bl);
   }
   void dump(Formatter *f) const;
@@ -109,12 +109,12 @@ struct cls_lock_get_info_op
 
   void encode(bufferlist &bl) const {
     ENCODE_START(1, 1, bl);
-    ::encode(name, bl);
+    encode(name, bl);
     ENCODE_FINISH(bl);
   }
-  void decode(bufferlist::iterator &bl) {
+  void decode(bufferlist::const_iterator &bl) {
     DECODE_START_LEGACY_COMPAT_LEN(1, 1, 1, bl);
-    ::decode(name, bl);
+    decode(name, bl);
     DECODE_FINISH(bl);
   }
   void dump(Formatter *f) const;
@@ -132,19 +132,19 @@ struct cls_lock_get_info_reply
 
   void encode(bufferlist &bl, uint64_t features) const {
     ENCODE_START(1, 1, bl);
-    ::encode(lockers, bl, features);
+    encode(lockers, bl, features);
     uint8_t t = (uint8_t)lock_type;
-    ::encode(t, bl);
-    ::encode(tag, bl);
+    encode(t, bl);
+    encode(tag, bl);
     ENCODE_FINISH(bl);
   }
-  void decode(bufferlist::iterator &bl) {
+  void decode(bufferlist::const_iterator &bl) {
     DECODE_START_LEGACY_COMPAT_LEN(1, 1, 1, bl);
-    ::decode(lockers, bl);
+    decode(lockers, bl);
     uint8_t t;
-    ::decode(t, bl);
+    decode(t, bl);
     lock_type = (ClsLockType)t; 
-    ::decode(tag, bl);
+    decode(tag, bl);
     DECODE_FINISH(bl);
   }
   void dump(Formatter *f) const;
@@ -160,12 +160,12 @@ struct cls_lock_list_locks_reply
 
   void encode(bufferlist &bl) const {
     ENCODE_START(1, 1, bl);
-    ::encode(locks, bl);
+    encode(locks, bl);
     ENCODE_FINISH(bl);
   }
-  void decode(bufferlist::iterator &bl) {
+  void decode(bufferlist::const_iterator &bl) {
     DECODE_START_LEGACY_COMPAT_LEN(1, 1, 1, bl);
-    ::decode(locks, bl);
+    decode(locks, bl);
     DECODE_FINISH(bl);
   }
   void dump(Formatter *f) const;
@@ -184,21 +184,21 @@ struct cls_lock_assert_op
 
   void encode(bufferlist &bl) const {
     ENCODE_START(1, 1, bl);
-    ::encode(name, bl);
+    encode(name, bl);
     uint8_t t = (uint8_t)type;
-    ::encode(t, bl);
-    ::encode(cookie, bl);
-    ::encode(tag, bl);
+    encode(t, bl);
+    encode(cookie, bl);
+    encode(tag, bl);
     ENCODE_FINISH(bl);
   }
-  void decode(bufferlist::iterator &bl) {
+  void decode(bufferlist::const_iterator &bl) {
     DECODE_START_LEGACY_COMPAT_LEN(1, 1, 1, bl);
-    ::decode(name, bl);
+    decode(name, bl);
     uint8_t t;
-    ::decode(t, bl);
+    decode(t, bl);
     type = (ClsLockType)t;
-    ::decode(cookie, bl);
-    ::decode(tag, bl);
+    decode(cookie, bl);
+    decode(tag, bl);
     DECODE_FINISH(bl);
   }
   void dump(Formatter *f) const;
@@ -218,23 +218,23 @@ struct cls_lock_set_cookie_op
 
   void encode(bufferlist &bl) const {
     ENCODE_START(1, 1, bl);
-    ::encode(name, bl);
+    encode(name, bl);
     uint8_t t = (uint8_t)type;
-    ::encode(t, bl);
-    ::encode(cookie, bl);
-    ::encode(tag, bl);
-    ::encode(new_cookie, bl);
+    encode(t, bl);
+    encode(cookie, bl);
+    encode(tag, bl);
+    encode(new_cookie, bl);
     ENCODE_FINISH(bl);
   }
-  void decode(bufferlist::iterator &bl) {
+  void decode(bufferlist::const_iterator &bl) {
     DECODE_START_LEGACY_COMPAT_LEN(1, 1, 1, bl);
-    ::decode(name, bl);
+    decode(name, bl);
     uint8_t t;
-    ::decode(t, bl);
+    decode(t, bl);
     type = (ClsLockType)t;
-    ::decode(cookie, bl);
-    ::decode(tag, bl);
-    ::decode(new_cookie, bl);
+    decode(cookie, bl);
+    decode(tag, bl);
+    decode(new_cookie, bl);
     DECODE_FINISH(bl);
   }
   void dump(Formatter *f) const;