Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux...

[safe/jmp/linux-2.6] / fs / ceph / decode.h

diff --git a/fs/ceph/decode.h b/fs/ceph/decode.h
index 91179fb..65b3e02 100644 (file)
--- a/fs/ceph/decode.h
+++ b/fs/ceph/decode.h
@@ -2,6 +2,7 @@
 #define __CEPH_DECODE_H
 
 #include <asm/unaligned.h>
+#include <linux/time.h>
 
 #include "types.h"
 
@@ -65,6 +66,11 @@ static inline void ceph_decode_copy(void **p, void *pv, size_t n)
                ceph_decode_need(p, end, sizeof(u16), bad);     \
                v = ceph_decode_16(p);                          \
        } while (0)
+#define ceph_decode_8_safe(p, end, v, bad)                     \
+       do {                                                    \
+               ceph_decode_need(p, end, sizeof(u8), bad);      \
+               v = ceph_decode_8(p);                           \
+       } while (0)
 
 #define ceph_decode_copy_safe(p, end, pv, n, bad)              \
        do {                                                    \
@@ -76,19 +82,32 @@ static inline void ceph_decode_copy(void **p, void *pv, size_t n)
  * struct ceph_timespec <-> struct timespec
  */
 static inline void ceph_decode_timespec(struct timespec *ts,
-                                       struct ceph_timespec *tv)
+                                       const struct ceph_timespec *tv)
 {
        ts->tv_sec = le32_to_cpu(tv->tv_sec);
        ts->tv_nsec = le32_to_cpu(tv->tv_nsec);
 }
 static inline void ceph_encode_timespec(struct ceph_timespec *tv,
-                                       struct timespec *ts)
+                                       const struct timespec *ts)
 {
        tv->tv_sec = cpu_to_le32(ts->tv_sec);
        tv->tv_nsec = cpu_to_le32(ts->tv_nsec);
 }
 
 /*
+ * sockaddr_storage <-> ceph_sockaddr
+ */
+static inline void ceph_encode_addr(struct ceph_entity_addr *a)
+{
+       a->in_addr.ss_family = htons(a->in_addr.ss_family);
+}
+static inline void ceph_decode_addr(struct ceph_entity_addr *a)
+{
+       a->in_addr.ss_family = ntohs(a->in_addr.ss_family);
+       WARN_ON(a->in_addr.ss_family == 512);
+}
+
+/*
  * encoders
  */
 static inline void ceph_encode_64(void **p, u64 v)
@@ -111,6 +130,11 @@ static inline void ceph_encode_8(void **p, u8 v)
        *(u8 *)*p = v;
        (*p)++;
 }
+static inline void ceph_encode_copy(void **p, const void *s, int len)
+{
+       memcpy(*p, s, len);
+       *p += len;
+}
 
 /*
  * filepath, string encoders
@@ -120,6 +144,7 @@ static inline void ceph_encode_filepath(void **p, void *end,
 {
        u32 len = path ? strlen(path) : 0;
        BUG_ON(*p + sizeof(ino) + sizeof(len) + len > end);
+       ceph_encode_8(p, 1);
        ceph_encode_64(p, ino);
        ceph_encode_32(p, len);
        if (len)
@@ -137,5 +162,33 @@ static inline void ceph_encode_string(void **p, void *end,
        *p += len;
 }
 
+#define ceph_encode_need(p, end, n, bad)               \
+       do {                                            \
+               if (unlikely(*(p) + (n) > (end)))       \
+                       goto bad;                       \
+       } while (0)
+
+#define ceph_encode_64_safe(p, end, v, bad)                    \
+       do {                                                    \
+               ceph_encode_need(p, end, sizeof(u64), bad);     \
+               ceph_encode_64(p, v);                           \
+       } while (0)
+#define ceph_encode_32_safe(p, end, v, bad)                    \
+       do {                                                    \
+               ceph_encode_need(p, end, sizeof(u32), bad);     \
+               ceph_encode_32(p, v);                   \
+       } while (0)
+#define ceph_encode_16_safe(p, end, v, bad)                    \
+       do {                                                    \
+               ceph_encode_need(p, end, sizeof(u16), bad);     \
+               ceph_encode_16(p, v);                   \
+       } while (0)
+
+#define ceph_encode_copy_safe(p, end, pv, n, bad)              \
+       do {                                                    \
+               ceph_encode_need(p, end, n, bad);               \
+               ceph_encode_copy(p, pv, n);                     \
+       } while (0)
+
 
 #endif