libceph: ceph_decode_skip_* helpers

Some of these won't be as efficient as they could be (e.g.
ceph_decode_skip_set(... 32 ...) could advance by len * sizeof(u32)
once instead of advancing by sizeof(u32) len times), but that's fine
and not worth a bunch of extra macro code.

Replace skip_name_map() with ceph_decode_skip_map as an example.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>

1 files changed, 60 insertions, 0 deletions

diff --git a/include/linux/ceph/decode.h b/include/linux/ceph/decode.h
index f990f2cc907a..14af9b70d301 100644
--- a/include/linux/ceph/decode.h
+++ b/include/linux/ceph/decode.h
@@ -133,6 +133,66 @@ bad:
 }
 
 /*
+ * skip helpers
+ */
+#define ceph_decode_skip_n(p, end, n, bad)                      \
+        do {                                                    \
+                ceph_decode_need(p, end, n, bad);               \
+                *p += n;                                        \
+        } while (0)
+
+#define ceph_decode_skip_64(p, end, bad)                        \
+ceph_decode_skip_n(p, end, sizeof(u64), bad)
+
+#define ceph_decode_skip_32(p, end, bad)                        \
+ceph_decode_skip_n(p, end, sizeof(u32), bad)
+
+#define ceph_decode_skip_16(p, end, bad)                        \
+ceph_decode_skip_n(p, end, sizeof(u16), bad)
+
+#define ceph_decode_skip_8(p, end, bad)                         \
+ceph_decode_skip_n(p, end, sizeof(u8), bad)
+
+#define ceph_decode_skip_string(p, end, bad)                    \
+        do {                                                    \
+                u32 len;                                        \
+                                                                \
+                ceph_decode_32_safe(p, end, len, bad);          \
+                ceph_decode_skip_n(p, end, len, bad);           \
+        } while (0)
+
+#define ceph_decode_skip_set(p, end, type, bad)                 \
+        do {                                                    \
+                u32 len;                                        \
+                                                                \
+                ceph_decode_32_safe(p, end, len, bad);          \
+                while (len--)                                   \
+                        ceph_decode_skip_##type(p, end, bad);   \
+        } while (0)
+
+#define ceph_decode_skip_map(p, end, ktype, vtype, bad)         \
+        do {                                                    \
+                u32 len;                                        \
+                                                                \
+                ceph_decode_32_safe(p, end, len, bad);          \
+                while (len--) {                                 \
+                        ceph_decode_skip_##ktype(p, end, bad);  \
+                        ceph_decode_skip_##vtype(p, end, bad);  \
+                }                                               \
+        } while (0)
+
+#define ceph_decode_skip_map_of_map(p, end, ktype1, ktype2, vtype2, bad) \
+        do {                                                    \
+                u32 len;                                        \
+                                                                \
+                ceph_decode_32_safe(p, end, len, bad);          \
+                while (len--) {                                 \
+                        ceph_decode_skip_##ktype1(p, end, bad); \
+                        ceph_decode_skip_map(p, end, ktype2, vtype2, bad); \
+                }                                               \
+        } while (0)
+
+/*
  * struct ceph_timespec <-> struct timespec
  */
 static inline void ceph_decode_timespec(struct timespec *ts,