From 67f3fafdf0014d9e63e20938f8758494180b587a Mon Sep 17 00:00:00 2001 From: "Darrick J. Wong" Date: Wed, 6 Dec 2017 09:17:08 -0600 Subject: [PATCH] libfrog: promote avl64 code from xfs_repair xfs_scrub will make use of the avl64 code, so promote it out of repair and into libfrog. Signed-off-by: Darrick J. Wong Reviewed-by: Eric Sandeen Signed-off-by: Eric Sandeen --- {repair => include}/avl64.h | 0 libfrog/Makefile | 1 + {repair => libfrog}/avl64.c | 4 ++-- repair/Makefile | 4 ++-- 4 files changed, 5 insertions(+), 4 deletions(-) rename {repair => include}/avl64.h (100%) rename {repair => libfrog}/avl64.c (99%) diff --git a/repair/avl64.h b/include/avl64.h similarity index 100% rename from repair/avl64.h rename to include/avl64.h diff --git a/libfrog/Makefile b/libfrog/Makefile index 6034da567..3fd42a435 100644 --- a/libfrog/Makefile +++ b/libfrog/Makefile @@ -11,6 +11,7 @@ LT_REVISION = 0 LT_AGE = 0 CFILES = \ +avl64.c \ list_sort.c \ radix-tree.c \ util.c diff --git a/repair/avl64.c b/libfrog/avl64.c similarity index 99% rename from repair/avl64.c rename to libfrog/avl64.c index 8f4a12118..01cfee437 100644 --- a/repair/avl64.c +++ b/libfrog/avl64.c @@ -15,9 +15,9 @@ * along with this program; if not, write the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ - +#include #include -#include "libxfs.h" +#include "platform_defs.h" #include "avl64.h" #define CERT ASSERT diff --git a/repair/Makefile b/repair/Makefile index 4184a70f6..c348cec98 100644 --- a/repair/Makefile +++ b/repair/Makefile @@ -9,11 +9,11 @@ LSRCFILES = README LTCOMMAND = xfs_repair -HFILES = agheader.h attr_repair.h avl.h avl64.h bmap.h btree.h \ +HFILES = agheader.h attr_repair.h avl.h bmap.h btree.h \ da_util.h dinode.h dir2.h err_protos.h globals.h incore.h protos.h \ rt.h progress.h scan.h versions.h prefetch.h rmap.h slab.h threads.h -CFILES = agheader.c attr_repair.c avl.c avl64.c bmap.c btree.c \ +CFILES = agheader.c attr_repair.c avl.c bmap.c btree.c \ da_util.c dino_chunks.c dinode.c dir2.c globals.c incore.c \ incore_bmc.c init.c incore_ext.c incore_ino.c phase1.c \ phase2.c phase3.c phase4.c phase5.c phase6.c phase7.c \ -- 2.47.2