From 56598728de8d10ac53e57e28aa61f75c6cdcd366 Mon Sep 17 00:00:00 2001 From: "Darrick J. Wong" Date: Mon, 9 Sep 2019 15:37:06 -0400 Subject: [PATCH] libfrog: move workqueue.h to libfrog/ Move this header to libfrog since the code is there already. Signed-off-by: Darrick J. Wong Reviewed-by: Dave Chinner Signed-off-by: Eric Sandeen --- libfrog/Makefile | 3 ++- {include => libfrog}/workqueue.h | 6 +++--- repair/threads.h | 2 +- scrub/fscounters.c | 2 +- scrub/inodes.c | 2 +- scrub/phase1.c | 2 +- scrub/phase2.c | 2 +- scrub/phase3.c | 2 +- scrub/phase4.c | 2 +- scrub/phase5.c | 2 +- scrub/phase6.c | 2 +- scrub/read_verify.c | 2 +- scrub/spacemap.c | 2 +- scrub/vfs.c | 2 +- 14 files changed, 17 insertions(+), 16 deletions(-) rename {include => libfrog}/workqueue.h (89%) diff --git a/libfrog/Makefile b/libfrog/Makefile index 482893efc..5506c96f9 100644 --- a/libfrog/Makefile +++ b/libfrog/Makefile @@ -37,7 +37,8 @@ crc32table.h \ fsgeom.h \ ptvar.h \ radix-tree.h \ -topology.h +topology.h \ +workqueue.h LSRCFILES += gen_crc32table.c diff --git a/include/workqueue.h b/libfrog/workqueue.h similarity index 89% rename from include/workqueue.h rename to libfrog/workqueue.h index c45dc4fbc..a1f3a57c3 100644 --- a/include/workqueue.h +++ b/libfrog/workqueue.h @@ -3,8 +3,8 @@ * Copyright (C) 2017 Oracle. All Rights Reserved. * Author: Darrick J. Wong */ -#ifndef _WORKQUEUE_H_ -#define _WORKQUEUE_H_ +#ifndef __LIBFROG_WORKQUEUE_H__ +#define __LIBFROG_WORKQUEUE_H__ #include @@ -38,4 +38,4 @@ int workqueue_add(struct workqueue *wq, workqueue_func_t fn, uint32_t index, void *arg); void workqueue_destroy(struct workqueue *wq); -#endif /* _WORKQUEUE_H_ */ +#endif /* __LIBFROG_WORKQUEUE_H__ */ diff --git a/repair/threads.h b/repair/threads.h index 22f74d1f6..55c7c6327 100644 --- a/repair/threads.h +++ b/repair/threads.h @@ -3,7 +3,7 @@ #ifndef _XFS_REPAIR_THREADS_H_ #define _XFS_REPAIR_THREADS_H_ -#include "workqueue.h" +#include "libfrog/workqueue.h" void thread_init(void); diff --git a/scrub/fscounters.c b/scrub/fscounters.c index f8cc1e947..9635c44f5 100644 --- a/scrub/fscounters.c +++ b/scrub/fscounters.c @@ -11,7 +11,7 @@ #include "xfs_arch.h" #include "xfs_format.h" #include "path.h" -#include "workqueue.h" +#include "libfrog/workqueue.h" #include "xfs_scrub.h" #include "common.h" #include "fscounters.h" diff --git a/scrub/inodes.c b/scrub/inodes.c index faffef543..19923de57 100644 --- a/scrub/inodes.c +++ b/scrub/inodes.c @@ -13,7 +13,7 @@ #include "xfs_format.h" #include "handle.h" #include "path.h" -#include "workqueue.h" +#include "libfrog/workqueue.h" #include "xfs_scrub.h" #include "common.h" #include "inodes.h" diff --git a/scrub/phase1.c b/scrub/phase1.c index 23df9a150..d0e77cabe 100644 --- a/scrub/phase1.c +++ b/scrub/phase1.c @@ -14,7 +14,7 @@ #include #include #include "libfrog.h" -#include "workqueue.h" +#include "libfrog/workqueue.h" #include "input.h" #include "path.h" #include "handle.h" diff --git a/scrub/phase2.c b/scrub/phase2.c index a80da7fd7..baec11dd9 100644 --- a/scrub/phase2.c +++ b/scrub/phase2.c @@ -9,7 +9,7 @@ #include #include "list.h" #include "path.h" -#include "workqueue.h" +#include "libfrog/workqueue.h" #include "xfs_scrub.h" #include "common.h" #include "scrub.h" diff --git a/scrub/phase3.c b/scrub/phase3.c index 8c02f1cb1..64a499c3b 100644 --- a/scrub/phase3.c +++ b/scrub/phase3.c @@ -9,7 +9,7 @@ #include #include "list.h" #include "path.h" -#include "workqueue.h" +#include "libfrog/workqueue.h" #include "xfs_scrub.h" #include "common.h" #include "counter.h" diff --git a/scrub/phase4.c b/scrub/phase4.c index 49f00723c..140748358 100644 --- a/scrub/phase4.c +++ b/scrub/phase4.c @@ -10,7 +10,7 @@ #include #include "list.h" #include "path.h" -#include "workqueue.h" +#include "libfrog/workqueue.h" #include "xfs_scrub.h" #include "common.h" #include "progress.h" diff --git a/scrub/phase5.c b/scrub/phase5.c index f3ee22e6a..ab015821a 100644 --- a/scrub/phase5.c +++ b/scrub/phase5.c @@ -15,7 +15,7 @@ #include "handle.h" #include "list.h" #include "path.h" -#include "workqueue.h" +#include "libfrog/workqueue.h" #include "xfs_scrub.h" #include "common.h" #include "inodes.h" diff --git a/scrub/phase6.c b/scrub/phase6.c index 9b0d228ac..d0e62cea9 100644 --- a/scrub/phase6.c +++ b/scrub/phase6.c @@ -9,7 +9,7 @@ #include #include "handle.h" #include "path.h" -#include "workqueue.h" +#include "libfrog/workqueue.h" #include "xfs_scrub.h" #include "common.h" #include "libfrog/bitmap.h" diff --git a/scrub/read_verify.c b/scrub/read_verify.c index d56f48936..828f6be64 100644 --- a/scrub/read_verify.c +++ b/scrub/read_verify.c @@ -8,7 +8,7 @@ #include #include #include "libfrog/ptvar.h" -#include "workqueue.h" +#include "libfrog/workqueue.h" #include "path.h" #include "xfs_scrub.h" #include "common.h" diff --git a/scrub/spacemap.c b/scrub/spacemap.c index c3621a3ab..774efbaae 100644 --- a/scrub/spacemap.c +++ b/scrub/spacemap.c @@ -8,7 +8,7 @@ #include #include #include -#include "workqueue.h" +#include "libfrog/workqueue.h" #include "path.h" #include "xfs_scrub.h" #include "common.h" diff --git a/scrub/vfs.c b/scrub/vfs.c index 7b0b5bcd9..7d79e7f78 100644 --- a/scrub/vfs.c +++ b/scrub/vfs.c @@ -10,7 +10,7 @@ #include #include "handle.h" #include "path.h" -#include "workqueue.h" +#include "libfrog/workqueue.h" #include "xfs_scrub.h" #include "common.h" #include "vfs.h" -- 2.47.2