diff options
author | Darrick J. Wong <darrick.wong@oracle.com> | 2017-12-06 09:17:08 -0600 |
---|---|---|
committer | Eric Sandeen <sandeen@redhat.com> | 2017-12-06 09:17:08 -0600 |
commit | 67f3fafdf0014d9e63e20938f8758494180b587a (patch) | |
tree | 41e64174679267847f6c66a9a9948a07228a9114 | |
parent | b28b84ca030c0bdef0f5e8619d915a98cfe1d1df (diff) | |
download | xfsprogs-dev-67f3fafdf0014d9e63e20938f8758494180b587a.tar.gz |
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 <darrick.wong@oracle.com>
Reviewed-by: Eric Sandeen <sandeen@redhat.com>
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>
-rw-r--r-- | include/avl64.h (renamed from repair/avl64.h) | 0 | ||||
-rw-r--r-- | libfrog/Makefile | 1 | ||||
-rw-r--r-- | libfrog/avl64.c (renamed from repair/avl64.c) | 4 | ||||
-rw-r--r-- | repair/Makefile | 4 |
4 files changed, 5 insertions, 4 deletions
diff --git a/repair/avl64.h b/include/avl64.h index cd079a00bd..cd079a00bd 100644 --- a/repair/avl64.h +++ b/include/avl64.h diff --git a/libfrog/Makefile b/libfrog/Makefile index 6034da5676..3fd42a4359 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 index 8f4a121180..01cfee437b 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 <stdint.h> #include <stdio.h> -#include "libxfs.h" +#include "platform_defs.h" #include "avl64.h" #define CERT ASSERT diff --git a/repair/Makefile b/repair/Makefile index 4184a70f62..c348cec989 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 \ |