From 660b5d9692691e384119dd11a8d60a900ef7b542 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 libfrog.h to libfrog/util.h

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>
---
 libfrog/fsgeom.c                    | 2 +-
 libfrog/util.c                      | 2 +-
 include/libfrog.h => libfrog/util.h | 6 +++---
 mkfs/xfs_mkfs.c                     | 2 +-
 repair/sb.c                         | 2 +-
 scrub/disk.c                        | 2 +-
 scrub/phase1.c                      | 2 +-
 7 files changed, 9 insertions(+), 9 deletions(-)
 rename include/libfrog.h => libfrog/util.h (65%)

diff --git a/libfrog/fsgeom.c b/libfrog/fsgeom.c
index 9a428bf6a..bc872834d 100644
--- a/libfrog/fsgeom.c
+++ b/libfrog/fsgeom.c
@@ -4,7 +4,7 @@
  */
 #include "libxfs.h"
 #include "fsgeom.h"
-#include "libfrog.h"
+#include "util.h"
 
 void
 xfs_report_geom(
diff --git a/libfrog/util.c b/libfrog/util.c
index ff935184c..8fb10cf82 100644
--- a/libfrog/util.c
+++ b/libfrog/util.c
@@ -4,7 +4,7 @@
  * All Rights Reserved.
  */
 #include "platform_defs.h"
-#include "libfrog.h"
+#include "util.h"
 
 /*
  * libfrog is a collection of miscellaneous userspace utilities.
diff --git a/include/libfrog.h b/libfrog/util.h
similarity index 65%
rename from include/libfrog.h
rename to libfrog/util.h
index d33f01468..1b97881bf 100644
--- a/include/libfrog.h
+++ b/libfrog/util.h
@@ -3,9 +3,9 @@
  * Copyright (c) 2000-2005 Silicon Graphics, Inc.
  * All Rights Reserved.
  */
-#ifndef __LIBFROG_UTIL_H_
-#define __LIBFROG_UTIL_H_
+#ifndef __LIBFROG_UTIL_H__
+#define __LIBFROG_UTIL_H__
 
 unsigned int	log2_roundup(unsigned int i);
 
-#endif /* __LIBFROG_UTIL_H_ */
+#endif /* __LIBFROG_UTIL_H__ */
diff --git a/mkfs/xfs_mkfs.c b/mkfs/xfs_mkfs.c
index 50913866b..6254fd426 100644
--- a/mkfs/xfs_mkfs.c
+++ b/mkfs/xfs_mkfs.c
@@ -3,7 +3,7 @@
  * Copyright (c) 2000-2005 Silicon Graphics, Inc.
  * All Rights Reserved.
  */
-#include "libfrog.h"
+#include "libfrog/util.h"
 #include "libxfs.h"
 #include <ctype.h>
 #include "xfs_multidisk.h"
diff --git a/repair/sb.c b/repair/sb.c
index 3955dfba2..91a36dd34 100644
--- a/repair/sb.c
+++ b/repair/sb.c
@@ -3,7 +3,7 @@
  * Copyright (c) 2000-2003,2005 Silicon Graphics, Inc.
  * All Rights Reserved.
  */
-#include "libfrog.h"
+#include "libfrog/util.h"
 #include "libxfs.h"
 #include "libxcmd.h"
 #include "libxlog.h"
diff --git a/scrub/disk.c b/scrub/disk.c
index 91e13140b..dcdd5ba83 100644
--- a/scrub/disk.c
+++ b/scrub/disk.c
@@ -17,7 +17,7 @@
 # include <linux/hdreg.h>
 #endif
 #include "platform_defs.h"
-#include "libfrog.h"
+#include "libfrog/util.h"
 #include "libfrog/paths.h"
 #include "xfs_scrub.h"
 #include "common.h"
diff --git a/scrub/phase1.c b/scrub/phase1.c
index d123c4199..3211a488a 100644
--- a/scrub/phase1.c
+++ b/scrub/phase1.c
@@ -13,7 +13,7 @@
 #include <dirent.h>
 #include <stdint.h>
 #include <pthread.h>
-#include "libfrog.h"
+#include "libfrog/util.h"
 #include "libfrog/workqueue.h"
 #include "input.h"
 #include "libfrog/paths.h"
-- 
2.39.2