- landing of b_hd_cleanup_merge to HEAD.

[fs/lustre-release.git] / lnet / include / linux / portals_lib.h

diff --git a/lnet/include/linux/portals_lib.h b/lnet/include/linux/portals_lib.h
index b4741cc..8778a52 100644 (file)
--- a/lnet/include/linux/portals_lib.h
+++ b/lnet/include/linux/portals_lib.h
@@ -64,118 +64,6 @@ static inline size_t round_strlen(char *fset)
         return size_round(strlen(fset) + 1);
 }
 
-#ifdef __KERNEL__
-static inline char *strdup(const char *str)
-{
-        int len = strlen(str) + 1;
-        char *tmp = kmalloc(len, GFP_KERNEL);
-        if (tmp)
-                memcpy(tmp, str, len);
-
-        return tmp;
-}
-#endif
-
-#ifdef __KERNEL__
-# define NTOH__u16(var) le16_to_cpu(var)
-# define NTOH__u32(var) le32_to_cpu(var)
-# define NTOH__u64(var) le64_to_cpu(var)
-# define HTON__u16(var) cpu_to_le16(var)
-# define HTON__u32(var) cpu_to_le32(var)
-# define HTON__u64(var) cpu_to_le64(var)
-#else
-# define expansion_u64(var) \
-    ({  __u64 ret; \
-       switch (sizeof(var)) {   \
-       case 8: (ret) = (var); break; \
-       case 4: (ret) = (__u32)(var); break; \
-       case 2: (ret) = (__u16)(var); break; \
-       case 1: (ret) = (__u8)(var); break; \
-       };       \
-       (ret);     \
-    })
-# define NTOH__u16(var) (var)
-# define NTOH__u32(var) (var)
-# define NTOH__u64(var) (expansion_u64(var))
-# define HTON__u16(var) (var)
-# define HTON__u32(var) (var)
-# define HTON__u64(var) (expansion_u64(var))
-#endif
-
-/* 
- * copy sizeof(type) bytes from pointer to var and move ptr forward.
- * return EFAULT if pointer goes beyond end
- */
-#define UNLOGV(var,type,ptr,end)                \
-do {                                            \
-        var = *(type *)ptr;                     \
-        ptr += sizeof(type);                    \
-        if (ptr > end )                         \
-                return -EFAULT;                 \
-} while (0)
-
-/* the following two macros convert to little endian */
-/* type MUST be __u32 or __u64 */
-#define LUNLOGV(var,type,ptr,end)               \
-do {                                            \
-        var = NTOH##type(*(type *)ptr);         \
-        ptr += sizeof(type);                    \
-        if (ptr > end )                         \
-                return -EFAULT;                 \
-} while (0)
-
-/* now log values */
-#define LOGV(var,type,ptr)                      \
-do {                                            \
-        *((type *)ptr) = var;                   \
-        ptr += sizeof(type);                    \
-} while (0)
-
-/* and in network order */
-#define LLOGV(var,type,ptr)                     \
-do {                                            \
-        *((type *)ptr) = HTON##type(var);       \
-        ptr += sizeof(type);                    \
-} while (0)
-
-
-/* 
- * set var to point at (type *)ptr, move ptr forward with sizeof(type)
- * return from function with EFAULT if ptr goes beyond end
- */
-#define UNLOGP(var,type,ptr,end)                \
-do {                                            \
-        var = (type *)ptr;                      \
-        ptr += sizeof(type);                    \
-        if (ptr > end )                         \
-                return -EFAULT;                 \
-} while (0)
-
-#define LOGP(var,type,ptr)                      \
-do {                                            \
-        memcpy(ptr, var, sizeof(type));         \
-        ptr += sizeof(type);                    \
-} while (0)
-
-/* 
- * set var to point at (char *)ptr, move ptr forward by size_round(len);
- * return from function with EFAULT if ptr goes beyond end
- */
-#define UNLOGL(var,type,len,ptr,end)            \
-do {                                            \
-        var = (type *)ptr;                      \
-        ptr += size_round(len * sizeof(type));  \
-        if (ptr > end )                         \
-                return -EFAULT;                 \
-} while (0)
-
-#define UNLOGL0(var,type,len,ptr,end)                                   \
-do {                                                                    \
-        UNLOGL(var,type,len,ptr,end);                                   \
-        if ( *((char *)ptr - size_round(len) + len - 1) != '\0')        \
-                return -EFAULT;                                         \
-} while (0)
-
 #define LOGL(var,len,ptr)                                       \
 do {                                                            \
         if (var)                                                \