btrfs-progs: move volumes.c to kernel-shared/

Signed-off-by: David Sterba <dsterba@suse.com>

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 \

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 \

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"

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"

btrfs-map-logical.c

@@ -23,7 +23,7 @@
 #include <getopt.h>
 #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"

btrfs-select-super.c

@@ -23,7 +23,7 @@
 #include <sys/stat.h>
 #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"

btrfs.c

@@ -19,7 +19,7 @@
 #include <string.h>
 #include <getopt.h>
 
-#include "volumes.h"
+#include "kernel-shared/volumes.h"
 #include "crypto/crc32c.h"
 #include "cmds/commands.h"
 #include "common/utils.h"

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"
 

check/main.c

@@ -27,7 +27,7 @@
 #include <uuid/uuid.h>
 #include <time.h>
 #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"

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"
 

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"

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"

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"

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"

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"

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"

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"

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"
 

cmds/rescue.c

@@ -20,7 +20,7 @@
 
 #include <getopt.h>
 #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"

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"

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"

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"
 

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"

convert/common.c

@@ -17,7 +17,7 @@
 #include <unistd.h>
 #include <uuid/uuid.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 "mkfs/common.h"

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"

convert/source-fs.c

@@ -18,7 +18,7 @@
 #include <unistd.h>
 #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"
 

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"
 

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"

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"
 

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);

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"

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"

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"
 

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"

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"
 

mkfs/common.c

@@ -21,7 +21,7 @@
 #include <limits.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 "common/path-utils.h"
 #include "common/device-utils.h"

mkfs/main.c

@@ -34,7 +34,7 @@
 #include <blkid/blkid.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 "common/utils.h"
 #include "common/path-utils.h"

mkfs/rootdir.c

@@ -26,7 +26,7 @@
 #include <fcntl.h>
 #include <ftw.h>
 #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"