From a4122790ac5acaa823c9799fd6552ee5fb229431 Mon Sep 17 00:00:00 2001 From: David Sterba Date: Tue, 18 Aug 2020 11:12:28 +0200 Subject: [PATCH] btrfs-progs: move extent-cache.c to common/ Signed-off-by: David Sterba --- Android.mk | 4 ++-- Makefile | 4 ++-- btrfs-find-root.c | 2 +- btrfsck.h | 2 +- check/common.h | 2 +- cmds/rescue-chunk-recover.c | 2 +- extent-cache.c => common/extent-cache.c | 2 +- extent-cache.h => common/extent-cache.h | 0 convert/common.h | 2 +- ctree.h | 2 +- extent_io.h | 2 +- find-root.c | 2 +- find-root.h | 2 +- image/main.c | 2 +- repair.c | 2 +- tests/library-test.c | 2 +- 16 files changed, 17 insertions(+), 17 deletions(-) rename extent-cache.c => common/extent-cache.c (99%) rename extent-cache.h => common/extent-cache.h (100%) diff --git a/Android.mk b/Android.mk index 8288ba73..77975636 100644 --- a/Android.mk +++ b/Android.mk @@ -19,7 +19,7 @@ btrfs_shared_libraries := libext2_uuid \ objects := ctree.c disk-io.c kernel-lib/radix-tree.c extent-tree.c print-tree.c \ root-tree.c dir-item.c file-item.c inode-item.c inode-map.c \ - extent-cache.c extent_io.c volumes.c utils.c repair.c \ + common/extent-cache.c extent_io.c volumes.c utils.c repair.c \ qgroup.c free-space-cache.c kernel-lib/list_sort.c props.c \ kernel-shared/ulist.c qgroup-verify.c backref.c common/string-table.c task-utils.c \ inode.c file.c find-root.c free-space-tree.c help.c send-dump.c \ @@ -37,7 +37,7 @@ libbtrfs_objects := send-stream.c send-utils.c kernel-lib/rbtree.c btrfs-list.c libbtrfs_headers := send-stream.h send-utils.h send.h kernel-lib/rbtree.h btrfs-list.h \ crypto/crc32c.h kernel-lib/list.h kerncompat.h \ kernel-lib/radix-tree.h kernel-lib/sizes.h kernel-lib/raid56.h \ - extent-cache.h extent_io.h ioctl.h ctree.h btrfsck.h version.h + common/extent-cache.h extent_io.h ioctl.h ctree.h btrfsck.h version.h blkid_objects := partition/ superblocks/ topology/ diff --git a/Makefile b/Makefile index ee57d9f8..9a3441e4 100644 --- a/Makefile +++ b/Makefile @@ -160,7 +160,7 @@ cmds_objects = cmds/subvolume.o cmds/filesystem.o cmds/device.o cmds/scrub.o \ cmds/inspect-dump-super.o cmds/inspect-tree-stats.o cmds/filesystem-du.o \ mkfs/common.o check/mode-common.o check/mode-lowmem.o libbtrfs_objects = send-stream.o send-utils.o kernel-lib/rbtree.o btrfs-list.o \ - kernel-lib/radix-tree.o extent-cache.o extent_io.o \ + kernel-lib/radix-tree.o common/extent-cache.o extent_io.o \ crypto/crc32c.o common/messages.o \ kernel-shared/uuid-tree.o utils-lib.o common/rbtree-utils.o \ ctree.o disk-io.o extent-tree.o kernel-shared/delayed-ref.o print-tree.o \ @@ -174,7 +174,7 @@ libbtrfs_objects = send-stream.o send-utils.o kernel-lib/rbtree.o btrfs-list.o \ libbtrfs_headers = send-stream.h send-utils.h send.h kernel-lib/rbtree.h btrfs-list.h \ crypto/crc32c.h kernel-lib/list.h kerncompat.h \ kernel-lib/radix-tree.h kernel-lib/sizes.h kernel-lib/raid56.h \ - extent-cache.h extent_io.h ioctl.h ctree.h btrfsck.h version.h + common/extent-cache.h extent_io.h ioctl.h ctree.h btrfsck.h version.h libbtrfsutil_major := $(shell sed -rn 's/^\#define BTRFS_UTIL_VERSION_MAJOR ([0-9])+$$/\1/p' libbtrfsutil/btrfsutil.h) libbtrfsutil_minor := $(shell sed -rn 's/^\#define BTRFS_UTIL_VERSION_MINOR ([0-9])+$$/\1/p' libbtrfsutil/btrfsutil.h) libbtrfsutil_patch := $(shell sed -rn 's/^\#define BTRFS_UTIL_VERSION_PATCH ([0-9])+$$/\1/p' libbtrfsutil/btrfsutil.h) diff --git a/btrfs-find-root.c b/btrfs-find-root.c index 741eb9a9..42ee2391 100644 --- a/btrfs-find-root.c +++ b/btrfs-find-root.c @@ -33,7 +33,7 @@ #include "volumes.h" #include "common/utils.h" #include "crypto/crc32c.h" -#include "extent-cache.h" +#include "common/extent-cache.h" #include "find-root.h" #include "common/help.h" #include "cmds/commands.h" diff --git a/btrfsck.h b/btrfsck.h index ac7f5d48..c47fd2f2 100644 --- a/btrfsck.h +++ b/btrfsck.h @@ -23,7 +23,7 @@ #if BTRFS_FLAT_INCLUDES #include "kerncompat.h" #include "ctree.h" -#include "extent-cache.h" +#include "common/extent-cache.h" #include "kernel-lib/list.h" #else #include diff --git a/check/common.h b/check/common.h index 62cdc1d9..047663de 100644 --- a/check/common.h +++ b/check/common.h @@ -22,7 +22,7 @@ #include "kerncompat.h" #include "ctree.h" -#include "extent-cache.h" +#include "common/extent-cache.h" #include "kernel-lib/list.h" struct block_group_record { diff --git a/cmds/rescue-chunk-recover.c b/cmds/rescue-chunk-recover.c index 1dc269ad..33c07d5a 100644 --- a/cmds/rescue-chunk-recover.c +++ b/cmds/rescue-chunk-recover.c @@ -32,7 +32,7 @@ #include "kernel-lib/list.h" #include "kernel-lib/radix-tree.h" #include "ctree.h" -#include "extent-cache.h" +#include "common/extent-cache.h" #include "disk-io.h" #include "volumes.h" #include "transaction.h" diff --git a/extent-cache.c b/common/extent-cache.c similarity index 99% rename from extent-cache.c rename to common/extent-cache.c index 927597b3..3d42dbc0 100644 --- a/extent-cache.c +++ b/common/extent-cache.c @@ -18,7 +18,7 @@ #include #include #include "kerncompat.h" -#include "extent-cache.h" +#include "common/extent-cache.h" #include "common/rbtree-utils.h" struct cache_extent_search_range { diff --git a/extent-cache.h b/common/extent-cache.h similarity index 100% rename from extent-cache.h rename to common/extent-cache.h diff --git a/convert/common.h b/convert/common.h index 1384086a..1df75104 100644 --- a/convert/common.h +++ b/convert/common.h @@ -24,7 +24,7 @@ #include "kerncompat.h" #include "common/defs.h" -#include "extent-cache.h" +#include "common/extent-cache.h" struct btrfs_mkfs_config; diff --git a/ctree.h b/ctree.h index 5df0feb3..b24ed7a4 100644 --- a/ctree.h +++ b/ctree.h @@ -25,7 +25,7 @@ #include "kernel-lib/list.h" #include "kerncompat.h" #include "kernel-lib/radix-tree.h" -#include "extent-cache.h" +#include "common/extent-cache.h" #include "extent_io.h" #include "ioctl.h" #include "kernel-lib/sizes.h" diff --git a/extent_io.h b/extent_io.h index bf934dfc..a4c21360 100644 --- a/extent_io.h +++ b/extent_io.h @@ -21,7 +21,7 @@ #if BTRFS_FLAT_INCLUDES #include "kerncompat.h" -#include "extent-cache.h" +#include "common/extent-cache.h" #include "kernel-lib/list.h" #else #include diff --git a/find-root.c b/find-root.c index ea609920..4054e2b1 100644 --- a/find-root.c +++ b/find-root.c @@ -25,7 +25,7 @@ #include "find-root.h" #include "volumes.h" #include "disk-io.h" -#include "extent-cache.h" +#include "common/extent-cache.h" /* Return value is the same as btrfs_find_root_search(). */ static int add_eb_to_result(struct extent_buffer *eb, diff --git a/find-root.h b/find-root.h index 0505fd18..03514cb3 100644 --- a/find-root.h +++ b/find-root.h @@ -23,7 +23,7 @@ #include "ctree.h" #include "kernel-lib/list.h" -#include "extent-cache.h" +#include "common/extent-cache.h" /* * Find-root will restore the search result in a 2-level trees. diff --git a/image/main.c b/image/main.c index 81ad2a37..728c8917 100644 --- a/image/main.c +++ b/image/main.c @@ -35,7 +35,7 @@ #include "common/utils.h" #include "volumes.h" #include "extent_io.h" -#include "extent-cache.h" +#include "common/extent-cache.h" #include "common/help.h" #include "common/device-utils.h" #include "image/metadump.h" diff --git a/repair.c b/repair.c index 27e51ae3..3174e4d8 100644 --- a/repair.c +++ b/repair.c @@ -17,7 +17,7 @@ */ #include "ctree.h" -#include "extent-cache.h" +#include "common/extent-cache.h" #include "common/utils.h" #include "repair.h" diff --git a/tests/library-test.c b/tests/library-test.c index e47917c2..c0d0eeb0 100644 --- a/tests/library-test.c +++ b/tests/library-test.c @@ -29,7 +29,7 @@ #include "ioctl.h" #include "btrfs-list.h" #include "check/btrfsck.h" -#include "extent-cache.h" +#include "common/extent-cache.h" #include "send.h" #include "send-stream.h" #include "send-utils.h"