From 07ca08ffba93fc7819920d2097e7d3cdb10f35a8 Mon Sep 17 00:00:00 2001 From: David Sterba Date: Thu, 20 Jun 2019 01:46:21 +0200 Subject: [PATCH] btrfs-progs: move fsfeatures.[ch] to common/ Signed-off-by: David Sterba --- Android.mk | 2 +- Makefile | 2 +- cmds/filesystem-du.c | 2 +- cmds/filesystem.c | 2 +- fsfeatures.c => common/fsfeatures.c | 2 +- fsfeatures.h => common/fsfeatures.h | 0 convert/main.c | 2 +- mkfs/main.c | 2 +- utils.h | 2 +- 9 files changed, 8 insertions(+), 8 deletions(-) rename fsfeatures.c => common/fsfeatures.c (99%) rename fsfeatures.h => common/fsfeatures.h (100%) diff --git a/Android.mk b/Android.mk index de71a5d1..e14613a9 100644 --- a/Android.mk +++ b/Android.mk @@ -23,7 +23,7 @@ objects := ctree.c disk-io.c kernel-lib/radix-tree.c extent-tree.c print-tree.c qgroup.c free-space-cache.c kernel-lib/list_sort.c props.c \ kernel-shared/ulist.c qgroup-verify.c backref.c string-table.c task-utils.c \ inode.c file.c find-root.c free-space-tree.c help.c send-dump.c \ - fsfeatures.c kernel-lib/tables.c kernel-lib/raid56.c transaction.c + common/fsfeatures.c kernel-lib/tables.c kernel-lib/raid56.c transaction.c cmds_objects := cmds-subvolume.c cmds-filesystem.c cmds-device.c cmds-scrub.c \ cmds-inspect.c cmds-balance.c cmds-send.c cmds-receive.c \ cmds-quota.c cmds-qgroup.c cmds-replace.c cmds-check.c \ diff --git a/Makefile b/Makefile index 48725dfc..46face4e 100644 --- a/Makefile +++ b/Makefile @@ -134,7 +134,7 @@ objects = ctree.o disk-io.o kernel-lib/radix-tree.o extent-tree.o print-tree.o \ kernel-shared/ulist.o qgroup-verify.o backref.o string-table.o \ common/task-utils.o \ inode.o file.o find-root.o free-space-tree.o common/help.o send-dump.o \ - fsfeatures.o kernel-lib/tables.o kernel-lib/raid56.o transaction.o \ + common/fsfeatures.o kernel-lib/tables.o kernel-lib/raid56.o transaction.o \ delayed-ref.o cmds_objects = cmds/subvolume.o cmds/filesystem.o cmds/device.o cmds/scrub.o \ cmds/inspect.o cmds/balance.o cmds/send.o cmds/receive.o \ diff --git a/cmds/filesystem-du.c b/cmds/filesystem-du.c index 29738128..78979e6f 100644 --- a/cmds/filesystem-du.c +++ b/cmds/filesystem-du.c @@ -41,7 +41,7 @@ #include "interval_tree_generic.h" #include "common/help.h" -#include "fsfeatures.h" +#include "common/fsfeatures.h" static int summarize = 0; static unsigned unit_mode = UNITS_RAW; diff --git a/cmds/filesystem.c b/cmds/filesystem.c index 631c5187..d549d3d6 100644 --- a/cmds/filesystem.c +++ b/cmds/filesystem.c @@ -40,7 +40,7 @@ #include "list_sort.h" #include "disk-io.h" #include "common/help.h" -#include "fsfeatures.h" +#include "common/fsfeatures.h" /* * for btrfs fi show, we maintain a hash of fsids we've already printed. diff --git a/fsfeatures.c b/common/fsfeatures.c similarity index 99% rename from fsfeatures.c rename to common/fsfeatures.c index 7f3ef03b..43881370 100644 --- a/fsfeatures.c +++ b/common/fsfeatures.c @@ -17,7 +17,7 @@ #include "kerncompat.h" #include #include -#include "fsfeatures.h" +#include "common/fsfeatures.h" #include "ctree.h" #include "utils.h" diff --git a/fsfeatures.h b/common/fsfeatures.h similarity index 100% rename from fsfeatures.h rename to common/fsfeatures.h diff --git a/convert/main.c b/convert/main.c index 3c8bc8f6..9041d8de 100644 --- a/convert/main.c +++ b/convert/main.c @@ -102,7 +102,7 @@ #include "convert/common.h" #include "convert/source-fs.h" #include "kernel-lib/crc32c.h" -#include "fsfeatures.h" +#include "common/fsfeatures.h" extern const struct btrfs_convert_operations ext2_convert_ops; extern const struct btrfs_convert_operations reiserfs_convert_ops; diff --git a/mkfs/main.c b/mkfs/main.c index 937bf43b..e008e446 100644 --- a/mkfs/main.c +++ b/mkfs/main.c @@ -43,7 +43,7 @@ #include "mkfs/common.h" #include "mkfs/rootdir.h" #include "kernel-lib/crc32c.h" -#include "fsfeatures.h" +#include "common/fsfeatures.h" static int verbose = 1; diff --git a/utils.h b/utils.h index 9cbdd4d7..c4a1b511 100644 --- a/utils.h +++ b/utils.h @@ -29,7 +29,7 @@ #include "sizes.h" #include "common/messages.h" #include "ioctl.h" -#include "fsfeatures.h" +#include "common/fsfeatures.h" #define BTRFS_SCAN_MOUNTED (1ULL << 0) #define BTRFS_SCAN_LBLKID (1ULL << 1)