From 0144bcb7137f56950e036fbfdd75ff0b55aa1efd Mon Sep 17 00:00:00 2001 From: David Sterba Date: Tue, 18 Aug 2020 15:56:04 +0200 Subject: [PATCH] btrfs-progs: move volumes.c to kernel-shared/ Signed-off-by: David Sterba --- Android.mk | 2 +- Makefile | 2 +- btrfs-corrupt-block.c | 2 +- btrfs-find-root.c | 2 +- btrfs-map-logical.c | 2 +- btrfs-select-super.c | 2 +- btrfs.c | 2 +- btrfstune.c | 2 +- check/main.c | 2 +- check/mode-lowmem.c | 2 +- cmds/balance.c | 2 +- cmds/device.c | 2 +- cmds/filesystem.c | 2 +- cmds/inspect-dump-tree.c | 2 +- cmds/inspect-tree-stats.c | 2 +- cmds/replace.c | 2 +- cmds/rescue-chunk-recover.c | 2 +- cmds/rescue-super-recover.c | 2 +- cmds/rescue.c | 2 +- cmds/restore.c | 2 +- cmds/scrub.c | 2 +- common/device-scan.c | 2 +- common/utils.c | 2 +- convert/common.c | 2 +- convert/main.c | 2 +- convert/source-fs.c | 2 +- find-root.c | 2 +- image/main.c | 2 +- kernel-lib/raid56.c | 2 +- kernel-shared/ctree.c | 2 +- kernel-shared/disk-io.c | 2 +- kernel-shared/extent-tree.c | 2 +- kernel-shared/extent_io.c | 2 +- kernel-shared/free-space-tree.c | 2 +- volumes.c => kernel-shared/volumes.c | 2 +- volumes.h => kernel-shared/volumes.h | 0 mkfs/common.c | 2 +- mkfs/main.c | 2 +- mkfs/rootdir.c | 2 +- 39 files changed, 38 insertions(+), 38 deletions(-) rename volumes.c => kernel-shared/volumes.c (99%) rename volumes.h => kernel-shared/volumes.h (100%) diff --git a/Android.mk b/Android.mk index 5c52eae0..dced0b97 100644 --- a/Android.mk +++ b/Android.mk @@ -20,7 +20,7 @@ btrfs_shared_libraries := libext2_uuid \ objects := kernel-shared/ctree.c kernel-shared/disk-io.c kernel-lib/radix-tree.c \ kernel-shared/extent-tree.c kernel-shared/print-tree.c \ root-tree.c dir-item.c file-item.c inode-item.c inode-map.c \ - common/extent-cache.c kernel-shared/extent_io.c volumes.c utils.c repair.c \ + common/extent-cache.c kernel-shared/extent_io.c kernel-shared/volumes.c utils.c repair.c \ qgroup.c kernel-shared/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 \ kernel-shared/inode.c kernel-shared/file.c find-root.c \ diff --git a/Makefile b/Makefile index 27cb7392..a3fc1359 100644 --- a/Makefile +++ b/Makefile @@ -167,7 +167,7 @@ libbtrfs_objects = common/send-stream.o common/send-utils.o kernel-lib/rbtree.o kernel-shared/extent-tree.o kernel-shared/delayed-ref.o \ kernel-shared/print-tree.o \ kernel-shared/free-space-cache.o kernel-shared/root-tree.o \ - volumes.o kernel-shared/transaction.o \ + kernel-shared/volumes.o kernel-shared/transaction.o \ kernel-shared/free-space-tree.o repair.o kernel-shared/inode-item.o \ kernel-shared/file-item.o \ kernel-lib/raid56.o kernel-lib/tables.o \ diff --git a/btrfs-corrupt-block.c b/btrfs-corrupt-block.c index 74344216..0c022a8e 100644 --- a/btrfs-corrupt-block.c +++ b/btrfs-corrupt-block.c @@ -25,7 +25,7 @@ #include "kerncompat.h" #include "kernel-shared/ctree.h" -#include "volumes.h" +#include "kernel-shared/volumes.h" #include "kernel-shared/disk-io.h" #include "kernel-shared/print-tree.h" #include "kernel-shared/transaction.h" diff --git a/btrfs-find-root.c b/btrfs-find-root.c index aebf7bd2..bec5f732 100644 --- a/btrfs-find-root.c +++ b/btrfs-find-root.c @@ -30,7 +30,7 @@ #include "kernel-shared/print-tree.h" #include "kernel-shared/transaction.h" #include "kernel-lib/list.h" -#include "volumes.h" +#include "kernel-shared/volumes.h" #include "common/utils.h" #include "crypto/crc32c.h" #include "common/extent-cache.h" diff --git a/btrfs-map-logical.c b/btrfs-map-logical.c index f813115d..24c81b8d 100644 --- a/btrfs-map-logical.c +++ b/btrfs-map-logical.c @@ -23,7 +23,7 @@ #include #include "kerncompat.h" #include "kernel-shared/ctree.h" -#include "volumes.h" +#include "kernel-shared/volumes.h" #include "kernel-shared/disk-io.h" #include "kernel-shared/print-tree.h" #include "kernel-shared/transaction.h" diff --git a/btrfs-select-super.c b/btrfs-select-super.c index 33b29160..9a06f750 100644 --- a/btrfs-select-super.c +++ b/btrfs-select-super.c @@ -23,7 +23,7 @@ #include #include "kerncompat.h" #include "kernel-shared/ctree.h" -#include "volumes.h" +#include "kernel-shared/volumes.h" #include "kernel-shared/disk-io.h" #include "kernel-shared/print-tree.h" #include "kernel-shared/transaction.h" diff --git a/btrfs.c b/btrfs.c index eb3b6183..87d64f49 100644 --- a/btrfs.c +++ b/btrfs.c @@ -19,7 +19,7 @@ #include #include -#include "volumes.h" +#include "kernel-shared/volumes.h" #include "crypto/crc32c.h" #include "cmds/commands.h" #include "common/utils.h" diff --git a/btrfstune.c b/btrfstune.c index 977a824f..c13969a7 100644 --- a/btrfstune.c +++ b/btrfstune.c @@ -31,7 +31,7 @@ #include "kernel-shared/disk-io.h" #include "kernel-shared/transaction.h" #include "common/utils.h" -#include "volumes.h" +#include "kernel-shared/volumes.h" #include "common/help.h" #include "common/box.h" diff --git a/check/main.c b/check/main.c index 3cce15d0..cc902e15 100644 --- a/check/main.c +++ b/check/main.c @@ -27,7 +27,7 @@ #include #include #include "kernel-shared/ctree.h" -#include "volumes.h" +#include "kernel-shared/volumes.h" #include "repair.h" #include "kernel-shared/disk-io.h" #include "kernel-shared/print-tree.h" diff --git a/check/mode-lowmem.c b/check/mode-lowmem.c index b642badf..837bacf9 100644 --- a/check/mode-lowmem.c +++ b/check/mode-lowmem.c @@ -23,7 +23,7 @@ #include "kernel-shared/backref.h" #include "common/internal.h" #include "common/utils.h" -#include "volumes.h" +#include "kernel-shared/volumes.h" #include "check/mode-common.h" #include "check/mode-lowmem.h" diff --git a/cmds/balance.c b/cmds/balance.c index 46fc3af1..43812b24 100644 --- a/cmds/balance.c +++ b/cmds/balance.c @@ -28,7 +28,7 @@ #include "kerncompat.h" #include "kernel-shared/ctree.h" #include "ioctl.h" -#include "volumes.h" +#include "kernel-shared/volumes.h" #include "cmds/commands.h" #include "common/utils.h" diff --git a/cmds/device.c b/cmds/device.c index c8e44ef0..d72881f8 100644 --- a/cmds/device.c +++ b/cmds/device.c @@ -28,7 +28,7 @@ #include "kernel-shared/ctree.h" #include "ioctl.h" #include "common/utils.h" -#include "volumes.h" +#include "kernel-shared/volumes.h" #include "cmds/filesystem-usage.h" #include "cmds/commands.h" diff --git a/cmds/filesystem.c b/cmds/filesystem.c index 57814fd7..5d94b3dc 100644 --- a/cmds/filesystem.c +++ b/cmds/filesystem.c @@ -34,7 +34,7 @@ #include "kerncompat.h" #include "kernel-shared/ctree.h" #include "common/utils.h" -#include "volumes.h" +#include "kernel-shared/volumes.h" #include "cmds/commands.h" #include "cmds/filesystem-usage.h" #include "kernel-lib/list_sort.h" diff --git a/cmds/inspect-dump-tree.c b/cmds/inspect-dump-tree.c index f7e50767..7cc2a86e 100644 --- a/cmds/inspect-dump-tree.c +++ b/cmds/inspect-dump-tree.c @@ -29,7 +29,7 @@ #include "kernel-shared/disk-io.h" #include "kernel-shared/print-tree.h" #include "kernel-shared/transaction.h" -#include "volumes.h" +#include "kernel-shared/volumes.h" #include "cmds/commands.h" #include "common/utils.h" #include "common/help.h" diff --git a/cmds/inspect-tree-stats.c b/cmds/inspect-tree-stats.c index 86a2059d..623d1b2b 100644 --- a/cmds/inspect-tree-stats.c +++ b/cmds/inspect-tree-stats.c @@ -32,7 +32,7 @@ #include "kernel-shared/print-tree.h" #include "kernel-shared/transaction.h" #include "kernel-lib/list.h" -#include "volumes.h" +#include "kernel-shared/volumes.h" #include "common/utils.h" #include "cmds/commands.h" #include "common/help.h" diff --git a/cmds/replace.c b/cmds/replace.c index 56040859..7c4ca81c 100644 --- a/cmds/replace.c +++ b/cmds/replace.c @@ -33,7 +33,7 @@ #include "kernel-shared/ctree.h" #include "ioctl.h" #include "common/utils.h" -#include "volumes.h" +#include "kernel-shared/volumes.h" #include "kernel-shared/disk-io.h" #include "cmds/commands.h" diff --git a/cmds/rescue-chunk-recover.c b/cmds/rescue-chunk-recover.c index 60eddcd5..5f21672b 100644 --- a/cmds/rescue-chunk-recover.c +++ b/cmds/rescue-chunk-recover.c @@ -34,7 +34,7 @@ #include "kernel-shared/ctree.h" #include "common/extent-cache.h" #include "kernel-shared/disk-io.h" -#include "volumes.h" +#include "kernel-shared/volumes.h" #include "kernel-shared/transaction.h" #include "crypto/crc32c.h" #include "common/utils.h" diff --git a/cmds/rescue-super-recover.c b/cmds/rescue-super-recover.c index b14469ab..1eaa8729 100644 --- a/cmds/rescue-super-recover.c +++ b/cmds/rescue-super-recover.c @@ -32,7 +32,7 @@ #include "kernel-lib/list.h" #include "common/utils.h" #include "crypto/crc32c.h" -#include "volumes.h" +#include "kernel-shared/volumes.h" #include "cmds/commands.h" #include "cmds/rescue.h" diff --git a/cmds/rescue.c b/cmds/rescue.c index 0ba124cd..100d25f3 100644 --- a/cmds/rescue.c +++ b/cmds/rescue.c @@ -20,7 +20,7 @@ #include #include "kernel-shared/ctree.h" -#include "volumes.h" +#include "kernel-shared/volumes.h" #include "kernel-shared/transaction.h" #include "kernel-shared/disk-io.h" #include "cmds/commands.h" diff --git a/cmds/restore.c b/cmds/restore.c index 1a7f432c..2f3033dd 100644 --- a/cmds/restore.c +++ b/cmds/restore.c @@ -42,7 +42,7 @@ #include "kernel-shared/print-tree.h" #include "kernel-shared/transaction.h" #include "kernel-lib/list.h" -#include "volumes.h" +#include "kernel-shared/volumes.h" #include "common/utils.h" #include "cmds/commands.h" #include "common/help.h" diff --git a/cmds/scrub.c b/cmds/scrub.c index b402ca67..1ccd3ac3 100644 --- a/cmds/scrub.c +++ b/cmds/scrub.c @@ -40,7 +40,7 @@ #include "kernel-shared/ctree.h" #include "ioctl.h" #include "common/utils.h" -#include "volumes.h" +#include "kernel-shared/volumes.h" #include "kernel-shared/disk-io.h" #include "cmds/commands.h" diff --git a/common/device-scan.c b/common/device-scan.c index 4b8e3ed2..cd4c1282 100644 --- a/common/device-scan.c +++ b/common/device-scan.c @@ -33,7 +33,7 @@ #include "common/utils.h" #include "common/defs.h" #include "kernel-shared/ctree.h" -#include "volumes.h" +#include "kernel-shared/volumes.h" #include "kernel-shared/disk-io.h" #include "ioctl.h" diff --git a/common/utils.c b/common/utils.c index 065cefb7..c47ce29b 100644 --- a/common/utils.c +++ b/common/utils.c @@ -51,7 +51,7 @@ #include "common/utils.h" #include "common/path-utils.h" #include "common/device-scan.h" -#include "volumes.h" +#include "kernel-shared/volumes.h" #include "ioctl.h" #include "cmds/commands.h" #include "mkfs/common.h" diff --git a/convert/common.c b/convert/common.c index ee6dc07b..048629df 100644 --- a/convert/common.c +++ b/convert/common.c @@ -17,7 +17,7 @@ #include #include #include "kernel-shared/disk-io.h" -#include "volumes.h" +#include "kernel-shared/volumes.h" #include "common/utils.h" #include "common/path-utils.h" #include "mkfs/common.h" diff --git a/convert/main.c b/convert/main.c index 510ab0da..378fd61a 100644 --- a/convert/main.c +++ b/convert/main.c @@ -93,7 +93,7 @@ #include "kernel-shared/ctree.h" #include "kernel-shared/disk-io.h" -#include "volumes.h" +#include "kernel-shared/volumes.h" #include "kernel-shared/transaction.h" #include "common/utils.h" #include "common/task-utils.h" diff --git a/convert/source-fs.c b/convert/source-fs.c index d565a8c4..12deafaa 100644 --- a/convert/source-fs.c +++ b/convert/source-fs.c @@ -18,7 +18,7 @@ #include #include "common/internal.h" #include "kernel-shared/disk-io.h" -#include "volumes.h" +#include "kernel-shared/volumes.h" #include "convert/common.h" #include "convert/source-fs.h" diff --git a/find-root.c b/find-root.c index c4d02d79..c77f8e33 100644 --- a/find-root.c +++ b/find-root.c @@ -23,7 +23,7 @@ #include "kernel-shared/ctree.h" #include "common/utils.h" #include "find-root.h" -#include "volumes.h" +#include "kernel-shared/volumes.h" #include "kernel-shared/disk-io.h" #include "common/extent-cache.h" diff --git a/image/main.c b/image/main.c index ee099300..e59f24ff 100644 --- a/image/main.c +++ b/image/main.c @@ -33,7 +33,7 @@ #include "kernel-shared/disk-io.h" #include "kernel-shared/transaction.h" #include "common/utils.h" -#include "volumes.h" +#include "kernel-shared/volumes.h" #include "kernel-shared/extent_io.h" #include "common/extent-cache.h" #include "common/help.h" diff --git a/kernel-lib/raid56.c b/kernel-lib/raid56.c index 39134ca5..d1a507b4 100644 --- a/kernel-lib/raid56.c +++ b/kernel-lib/raid56.c @@ -26,7 +26,7 @@ #include "kerncompat.h" #include "kernel-shared/ctree.h" #include "kernel-shared/disk-io.h" -#include "volumes.h" +#include "kernel-shared/volumes.h" #include "common/utils.h" #include "kernel-lib/raid56.h" diff --git a/kernel-shared/ctree.c b/kernel-shared/ctree.c index 8981a80b..01bc33a4 100644 --- a/kernel-shared/ctree.c +++ b/kernel-shared/ctree.c @@ -24,7 +24,7 @@ #include "common/messages.h" #include "common/utils.h" #include "kernel-lib/sizes.h" -#include "volumes.h" +#include "kernel-shared/volumes.h" static int split_node(struct btrfs_trans_handle *trans, struct btrfs_root *root, struct btrfs_path *path, int level); diff --git a/kernel-shared/disk-io.c b/kernel-shared/disk-io.c index b6b13169..42f733e3 100644 --- a/kernel-shared/disk-io.c +++ b/kernel-shared/disk-io.c @@ -27,7 +27,7 @@ #include "kernel-lib/radix-tree.h" #include "kernel-shared/ctree.h" #include "kernel-shared/disk-io.h" -#include "volumes.h" +#include "kernel-shared/volumes.h" #include "kernel-shared/transaction.h" #include "crypto/crc32c.h" #include "common/utils.h" diff --git a/kernel-shared/extent-tree.c b/kernel-shared/extent-tree.c index 56a51ff9..5b1fbe10 100644 --- a/kernel-shared/extent-tree.c +++ b/kernel-shared/extent-tree.c @@ -28,7 +28,7 @@ #include "kernel-shared/print-tree.h" #include "kernel-shared/transaction.h" #include "crypto/crc32c.h" -#include "volumes.h" +#include "kernel-shared/volumes.h" #include "kernel-shared/free-space-cache.h" #include "kernel-shared/free-space-tree.h" #include "common/utils.h" diff --git a/kernel-shared/extent_io.c b/kernel-shared/extent_io.c index 63f82ac4..5a5c405b 100644 --- a/kernel-shared/extent_io.c +++ b/kernel-shared/extent_io.c @@ -27,7 +27,7 @@ #include "kernel-shared/extent_io.h" #include "kernel-lib/list.h" #include "kernel-shared/ctree.h" -#include "volumes.h" +#include "kernel-shared/volumes.h" #include "common/utils.h" #include "common/internal.h" diff --git a/kernel-shared/free-space-tree.c b/kernel-shared/free-space-tree.c index 9951408e..3570a9ac 100644 --- a/kernel-shared/free-space-tree.c +++ b/kernel-shared/free-space-tree.c @@ -20,7 +20,7 @@ #include "kernel-shared/disk-io.h" #include "kernel-shared/free-space-cache.h" #include "kernel-shared/free-space-tree.h" -#include "volumes.h" +#include "kernel-shared/volumes.h" #include "kernel-shared/transaction.h" #include "kernel-lib/bitops.h" #include "common/internal.h" diff --git a/volumes.c b/kernel-shared/volumes.c similarity index 99% rename from volumes.c rename to kernel-shared/volumes.c index a2a72fee..ddddae62 100644 --- a/volumes.c +++ b/kernel-shared/volumes.c @@ -26,7 +26,7 @@ #include "kernel-shared/disk-io.h" #include "kernel-shared/transaction.h" #include "kernel-shared/print-tree.h" -#include "volumes.h" +#include "kernel-shared/volumes.h" #include "common/utils.h" #include "kernel-lib/raid56.h" diff --git a/volumes.h b/kernel-shared/volumes.h similarity index 100% rename from volumes.h rename to kernel-shared/volumes.h diff --git a/mkfs/common.c b/mkfs/common.c index b1aff66d..368f3b06 100644 --- a/mkfs/common.c +++ b/mkfs/common.c @@ -21,7 +21,7 @@ #include #include "kernel-shared/ctree.h" #include "kernel-shared/disk-io.h" -#include "volumes.h" +#include "kernel-shared/volumes.h" #include "common/utils.h" #include "common/path-utils.h" #include "common/device-utils.h" diff --git a/mkfs/main.c b/mkfs/main.c index 3a7ae400..18dc6f8e 100644 --- a/mkfs/main.c +++ b/mkfs/main.c @@ -34,7 +34,7 @@ #include #include "kernel-shared/ctree.h" #include "kernel-shared/disk-io.h" -#include "volumes.h" +#include "kernel-shared/volumes.h" #include "kernel-shared/transaction.h" #include "common/utils.h" #include "common/path-utils.h" diff --git a/mkfs/rootdir.c b/mkfs/rootdir.c index 5a8445d8..4c078cfb 100644 --- a/mkfs/rootdir.c +++ b/mkfs/rootdir.c @@ -26,7 +26,7 @@ #include #include #include "kernel-shared/ctree.h" -#include "volumes.h" +#include "kernel-shared/volumes.h" #include "common/internal.h" #include "kernel-shared/disk-io.h" #include "common/messages.h"