From 63153a95f24093af13812eccb5aa357d02552adc Mon Sep 17 00:00:00 2001
From: "Darrick J. Wong" <darrick.wong@oracle.com>
Date: Mon, 9 Sep 2019 15:37:07 -0400
Subject: [PATCH] libfrog: move crc32c.h to libfrog/

Move this header to libfrog since the code is there already.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>
---
 io/crc32cselftest.c                   | 4 ++--
 libfrog/Makefile                      | 2 ++
 {include => libfrog}/crc32c.h         | 6 +++---
 {include => libfrog}/crc32cselftest.h | 6 +++---
 libxfs/libxfs_priv.h                  | 2 +-
 5 files changed, 11 insertions(+), 9 deletions(-)
 rename {include => libfrog}/crc32c.h (68%)
 rename {include => libfrog}/crc32cselftest.h (99%)

diff --git a/io/crc32cselftest.c b/io/crc32cselftest.c
index 28201384d..f8f757f6a 100644
--- a/io/crc32cselftest.c
+++ b/io/crc32cselftest.c
@@ -8,8 +8,8 @@
 #include "command.h"
 #include "init.h"
 #include "io.h"
-#include "crc32c.h"
-#include "crc32cselftest.h"
+#include "libfrog/crc32c.h"
+#include "libfrog/crc32cselftest.h"
 
 static int
 crc32cselftest_f(
diff --git a/libfrog/Makefile b/libfrog/Makefile
index 5506c96f9..715589c7a 100644
--- a/libfrog/Makefile
+++ b/libfrog/Makefile
@@ -32,6 +32,8 @@ avl64.h \
 bulkstat.h \
 bitmap.h \
 convert.h \
+crc32c.h \
+crc32cselftest.h \
 crc32defs.h \
 crc32table.h \
 fsgeom.h \
diff --git a/include/crc32c.h b/libfrog/crc32c.h
similarity index 68%
rename from include/crc32c.h
rename to libfrog/crc32c.h
index b4d8aa05f..22d25932f 100644
--- a/include/crc32c.h
+++ b/libfrog/crc32c.h
@@ -3,9 +3,9 @@
  * Copyright (c) 2000-2005 Silicon Graphics, Inc.
  * All Rights Reserved.
  */
-#ifndef LIBFROG_CRC32C_H_
-#define LIBFROG_CRC32C_H_
+#ifndef __LIBFROG_CRC32C_H__
+#define __LIBFROG_CRC32C_H__
 
 extern uint32_t crc32c_le(uint32_t crc, unsigned char const *p, size_t len);
 
-#endif /* LIBFROG_CRC32C_H_ */
+#endif /* __LIBFROG_CRC32C_H__ */
diff --git a/include/crc32cselftest.h b/libfrog/crc32cselftest.h
similarity index 99%
rename from include/crc32cselftest.h
rename to libfrog/crc32cselftest.h
index 11da676be..08284153c 100644
--- a/include/crc32cselftest.h
+++ b/libfrog/crc32cselftest.h
@@ -31,8 +31,8 @@
 
 /* This is just the crc32 self test bits from crc32.c. */
 
-#ifndef _LIBFROG_CRC32CSELFTEST_H_
-#define _LIBFROG_CRC32CSELFTEST_H_
+#ifndef __LIBFROG_CRC32CSELFTEST_H__
+#define __LIBFROG_CRC32CSELFTEST_H__
 
 /* 4096 random bytes */
 static uint8_t __attribute__((__aligned__(8))) test_buf[] =
@@ -703,4 +703,4 @@ crc32c_test(void)
 	return errors;
 }
 
-#endif /* _LIBFROG_CRC32CSELFTEST_H_ */
+#endif /* __LIBFROG_CRC32CSELFTEST_H__ */
diff --git a/libxfs/libxfs_priv.h b/libxfs/libxfs_priv.h
index ec4d7d3b3..96d74bfa3 100644
--- a/libxfs/libxfs_priv.h
+++ b/libxfs/libxfs_priv.h
@@ -53,7 +53,7 @@
 #include "xfs_arch.h"
 
 #include "xfs_fs.h"
-#include "crc32c.h"
+#include "libfrog/crc32c.h"
 
 /* Zones used in libxfs allocations that aren't in shared header files */
 extern kmem_zone_t *xfs_buf_item_zone;
-- 
2.39.2