Merge pull request #261 from martin-belanger/move-ccan-out-of-public-headers

Move ccan definitions out of public headers.

Author: dwsuse

src/nvme/util.c

@@ -759,3 +759,9 @@ size_t get_entity_version(char *buffer, size_t bufsz)
 
 	return num_bytes;
 }
+
+struct nvmf_ext_attr *nvmf_exat_ptr_next(struct nvmf_ext_attr *p)
+{
+	return (struct nvmf_ext_attr *)
+		((uintptr_t)p + (ptrdiff_t)nvmf_exat_size(le16_to_cpu(p->exatlen)));
+}

src/nvme/util.h

@@ -10,7 +10,6 @@
 #define _LIBNVME_UTIL_H
 
 #include "types.h"
-#include <ccan/endian/endian.h>
 
 /**
  * DOC: util.h
@@ -548,10 +547,6 @@ static inline __u16 nvmf_exat_size(size_t val_len)
  *
  * Return: Pointer to the next element in the array.
  */
-static inline struct nvmf_ext_attr *nvmf_exat_ptr_next(struct nvmf_ext_attr *p)
-{
-	return (struct nvmf_ext_attr *)
-		((uintptr_t)p + (ptrdiff_t)nvmf_exat_size(le16_to_cpu(p->exatlen)));
-}
+struct nvmf_ext_attr *nvmf_exat_ptr_next(struct nvmf_ext_attr *p);
 
 #endif /* _LIBNVME_UTIL_H */