From: Darrick J. Wong <darrick.wong@xxxxxxxxxx> Move this header to libfrog since the code is there already. Signed-off-by: Darrick J. Wong <darrick.wong@xxxxxxxxxx> --- include/libfrog.h | 11 ----------- libfrog/fsgeom.c | 2 +- libfrog/util.c | 2 +- libfrog/util.h | 11 +++++++++++ mkfs/xfs_mkfs.c | 2 +- repair/sb.c | 2 +- scrub/disk.c | 2 +- scrub/phase1.c | 2 +- 8 files changed, 17 insertions(+), 17 deletions(-) delete mode 100644 include/libfrog.h create mode 100644 libfrog/util.h diff --git a/include/libfrog.h b/include/libfrog.h deleted file mode 100644 index d33f0146..00000000 --- a/include/libfrog.h +++ /dev/null @@ -1,11 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -/* - * Copyright (c) 2000-2005 Silicon Graphics, Inc. - * All Rights Reserved. - */ -#ifndef __LIBFROG_UTIL_H_ -#define __LIBFROG_UTIL_H_ - -unsigned int log2_roundup(unsigned int i); - -#endif /* __LIBFROG_UTIL_H_ */ diff --git a/libfrog/fsgeom.c b/libfrog/fsgeom.c index 9a428bf6..bc872834 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 ff935184..8fb10cf8 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/libfrog/util.h b/libfrog/util.h new file mode 100644 index 00000000..1b97881b --- /dev/null +++ b/libfrog/util.h @@ -0,0 +1,11 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright (c) 2000-2005 Silicon Graphics, Inc. + * All Rights Reserved. + */ +#ifndef __LIBFROG_UTIL_H__ +#define __LIBFROG_UTIL_H__ + +unsigned int log2_roundup(unsigned int i); + +#endif /* __LIBFROG_UTIL_H__ */ diff --git a/mkfs/xfs_mkfs.c b/mkfs/xfs_mkfs.c index 50913866..6254fd42 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 3955dfba..91a36dd3 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 91e13140..dcdd5ba8 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 d123c419..3211a488 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"
