From d43a9f73ae4980606a6cbfa1777486d9dcc495b2 Mon Sep 17 00:00:00 2001

From: Martin Belanger <martin.belanger@dell.com>

Date: Mon, 28 Feb 2022 11:26:07 -0500

Subject: [PATCH] Move ccan definitions out of public headers.

Signed-off-by: Martin Belanger <martin.belanger@dell.com>

---

 src/nvme/util.c | 6 ++++++

 src/nvme/util.h | 7 +------

 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/nvme/util.c b/src/nvme/util.c

index 7d8a40b2..c95f16b3 100644

--- a/src/nvme/util.c

+++ b/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)));

+}

diff --git a/src/nvme/util.h b/src/nvme/util.h

index f1f6fcb6..f034c1b7 100644

--- a/src/nvme/util.h

+++ b/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 */