btrfs-progs: move disk-io.c to kernel-shared/

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

Android.mk

@@ -17,7 +17,7 @@ STATIC_LIBS := -luuid   -lblkid -luuid -lz   -llzo2 -L. -pthread
 btrfs_shared_libraries := libext2_uuid \
 			libext2_blkid
 
-objects := ctree.c disk-io.c kernel-lib/radix-tree.c kernel-shared/extent-tree.c \
+objects := 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 \

Makefile

@@ -163,7 +163,7 @@ libbtrfs_objects = common/send-stream.o common/send-utils.o kernel-lib/rbtree.o
 		   kernel-lib/radix-tree.o common/extent-cache.o kernel-shared/extent_io.o \
 		   crypto/crc32c.o common/messages.o \
 		   kernel-shared/uuid-tree.o common/utils-lib.o common/rbtree-utils.o \
-		   ctree.o disk-io.o kernel-shared/extent-tree.o kernel-shared/delayed-ref.o \
+		   ctree.o kernel-shared/disk-io.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 transaction.o \
 		   kernel-shared/free-space-tree.o repair.o kernel-shared/inode-item.o \

btrfs-corrupt-block.c

@@ -26,7 +26,7 @@
 #include "kerncompat.h"
 #include "ctree.h"
 #include "volumes.h"
-#include "disk-io.h"
+#include "kernel-shared/disk-io.h"
 #include "kernel-shared/print-tree.h"
 #include "transaction.h"
 #include "kernel-lib/list.h"

btrfs-find-root.c

@@ -26,7 +26,7 @@
 
 #include "kerncompat.h"
 #include "ctree.h"
-#include "disk-io.h"
+#include "kernel-shared/disk-io.h"
 #include "kernel-shared/print-tree.h"
 #include "transaction.h"
 #include "kernel-lib/list.h"

btrfs-map-logical.c

@@ -24,7 +24,7 @@
 #include "kerncompat.h"
 #include "ctree.h"
 #include "volumes.h"
-#include "disk-io.h"
+#include "kernel-shared/disk-io.h"
 #include "kernel-shared/print-tree.h"
 #include "transaction.h"
 #include "kernel-lib/list.h"

btrfs-sb-mod.c

@@ -25,7 +25,7 @@
 #include <limits.h>
 #include <byteswap.h>
 #include "crypto/crc32c.h"
-#include "disk-io.h"
+#include "kernel-shared/disk-io.h"
 
 #define BLOCKSIZE (4096)
 static char buf[BLOCKSIZE];

btrfs-select-super.c

@@ -24,7 +24,7 @@
 #include "kerncompat.h"
 #include "ctree.h"
 #include "volumes.h"
-#include "disk-io.h"
+#include "kernel-shared/disk-io.h"
 #include "kernel-shared/print-tree.h"
 #include "transaction.h"
 #include "kernel-lib/list.h"

btrfstune.c

@@ -28,7 +28,7 @@
 
 #include "kerncompat.h"
 #include "ctree.h"
-#include "disk-io.h"
+#include "kernel-shared/disk-io.h"
 #include "transaction.h"
 #include "common/utils.h"
 #include "volumes.h"

check/main.c

@@ -29,7 +29,7 @@
 #include "ctree.h"
 #include "volumes.h"
 #include "repair.h"
-#include "disk-io.h"
+#include "kernel-shared/disk-io.h"
 #include "kernel-shared/print-tree.h"
 #include "common/task-utils.h"
 #include "transaction.h"

check/mode-common.c

@@ -20,7 +20,7 @@
 #include "common/messages.h"
 #include "transaction.h"
 #include "common/utils.h"
-#include "disk-io.h"
+#include "kernel-shared/disk-io.h"
 #include "repair.h"
 #include "check/mode-common.h"
 

check/mode-lowmem.c

@@ -19,7 +19,7 @@
 #include "repair.h"
 #include "transaction.h"
 #include "common/messages.h"
-#include "disk-io.h"
+#include "kernel-shared/disk-io.h"
 #include "kernel-shared/backref.h"
 #include "common/internal.h"
 #include "common/utils.h"

check/qgroup-verify.c

@@ -24,7 +24,7 @@
 #include "kerncompat.h"
 #include "kernel-lib/radix-tree.h"
 #include "ctree.h"
-#include "disk-io.h"
+#include "kernel-shared/disk-io.h"
 #include "kernel-shared/print-tree.h"
 #include "common/utils.h"
 #include "kernel-shared/ulist.h"

cmds/filesystem-usage.c

@@ -30,7 +30,7 @@
 #include "common/string-table.h"
 #include "cmds/filesystem-usage.h"
 #include "cmds/commands.h"
-#include "disk-io.h"
+#include "kernel-shared/disk-io.h"
 
 #include "version.h"
 #include "common/help.h"

cmds/filesystem.c

@@ -38,7 +38,7 @@
 #include "cmds/commands.h"
 #include "cmds/filesystem-usage.h"
 #include "kernel-lib/list_sort.h"
-#include "disk-io.h"
+#include "kernel-shared/disk-io.h"
 #include "common/help.h"
 #include "common/fsfeatures.h"
 #include "common/path-utils.h"

cmds/inspect-dump-super.c

@@ -23,7 +23,7 @@
 #include <getopt.h>
 
 #include "ctree.h"
-#include "disk-io.h"
+#include "kernel-shared/disk-io.h"
 #include "kernel-shared/print-tree.h"
 #include "common/utils.h"
 #include "cmds/commands.h"

cmds/inspect-dump-tree.c

@@ -26,7 +26,7 @@
 #include "kerncompat.h"
 #include "kernel-lib/radix-tree.h"
 #include "ctree.h"
-#include "disk-io.h"
+#include "kernel-shared/disk-io.h"
 #include "kernel-shared/print-tree.h"
 #include "transaction.h"
 #include "volumes.h"

cmds/inspect-tree-stats.c

@@ -28,7 +28,7 @@
 
 #include "kerncompat.h"
 #include "ctree.h"
-#include "disk-io.h"
+#include "kernel-shared/disk-io.h"
 #include "kernel-shared/print-tree.h"
 #include "transaction.h"
 #include "kernel-lib/list.h"

cmds/inspect.c

@@ -28,7 +28,7 @@
 #include "common/utils.h"
 #include "ctree.h"
 #include "common/send-utils.h"
-#include "disk-io.h"
+#include "kernel-shared/disk-io.h"
 #include "cmds/commands.h"
 #include "btrfs-list.h"
 #include "common/help.h"

cmds/replace.c

@@ -34,7 +34,7 @@
 #include "ioctl.h"
 #include "common/utils.h"
 #include "volumes.h"
-#include "disk-io.h"
+#include "kernel-shared/disk-io.h"
 
 #include "cmds/commands.h"
 #include "common/help.h"

cmds/rescue-chunk-recover.c

@@ -33,7 +33,7 @@
 #include "kernel-lib/radix-tree.h"
 #include "ctree.h"
 #include "common/extent-cache.h"
-#include "disk-io.h"
+#include "kernel-shared/disk-io.h"
 #include "volumes.h"
 #include "transaction.h"
 #include "crypto/crc32c.h"

cmds/rescue-super-recover.c

@@ -28,7 +28,7 @@
 
 #include "kerncompat.h"
 #include "ctree.h"
-#include "disk-io.h"
+#include "kernel-shared/disk-io.h"
 #include "kernel-lib/list.h"
 #include "common/utils.h"
 #include "crypto/crc32c.h"

cmds/rescue.c

@@ -22,7 +22,7 @@
 #include "ctree.h"
 #include "volumes.h"
 #include "transaction.h"
-#include "disk-io.h"
+#include "kernel-shared/disk-io.h"
 #include "cmds/commands.h"
 #include "common/utils.h"
 #include "common/help.h"

cmds/restore.c

@@ -38,7 +38,7 @@
 #include <sys/xattr.h>
 
 #include "ctree.h"
-#include "disk-io.h"
+#include "kernel-shared/disk-io.h"
 #include "kernel-shared/print-tree.h"
 #include "transaction.h"
 #include "kernel-lib/list.h"

cmds/scrub.c

@@ -41,7 +41,7 @@
 #include "ioctl.h"
 #include "common/utils.h"
 #include "volumes.h"
-#include "disk-io.h"
+#include "kernel-shared/disk-io.h"
 
 #include "cmds/commands.h"
 #include "common/help.h"

common/device-scan.c

@@ -34,7 +34,7 @@
 #include "common/defs.h"
 #include "ctree.h"
 #include "volumes.h"
-#include "disk-io.h"
+#include "kernel-shared/disk-io.h"
 #include "ioctl.h"
 
 static int btrfs_scan_done = 0;

common/device-utils.c

@@ -24,7 +24,7 @@
 #include <fcntl.h>
 #include <blkid/blkid.h>
 #include "kernel-lib/sizes.h"
-#include "disk-io.h"
+#include "kernel-shared/disk-io.h"
 #include "common/device-utils.h"
 #include "common/internal.h"
 #include "common/messages.h"

common/utils.c

@@ -45,7 +45,7 @@
 #include "kerncompat.h"
 #include "kernel-lib/radix-tree.h"
 #include "ctree.h"
-#include "disk-io.h"
+#include "kernel-shared/disk-io.h"
 #include "transaction.h"
 #include "crypto/crc32c.h"
 #include "common/utils.h"

convert/common.c

@@ -16,7 +16,7 @@
 
 #include <unistd.h>
 #include <uuid/uuid.h>
-#include "disk-io.h"
+#include "kernel-shared/disk-io.h"
 #include "volumes.h"
 #include "common/utils.h"
 #include "common/path-utils.h"

convert/main.c

@@ -92,7 +92,7 @@
 #include <stdbool.h>
 
 #include "ctree.h"
-#include "disk-io.h"
+#include "kernel-shared/disk-io.h"
 #include "volumes.h"
 #include "transaction.h"
 #include "common/utils.h"

convert/source-ext2.c

@@ -19,7 +19,7 @@
 #include "kerncompat.h"
 #include <linux/limits.h>
 #include <pthread.h>
-#include "disk-io.h"
+#include "kernel-shared/disk-io.h"
 #include "transaction.h"
 #include "common/utils.h"
 #include "convert/common.h"

convert/source-fs.c

@@ -17,7 +17,7 @@
 #include "kerncompat.h"
 #include <unistd.h>
 #include "common/internal.h"
-#include "disk-io.h"
+#include "kernel-shared/disk-io.h"
 #include "volumes.h"
 #include "convert/common.h"
 #include "convert/source-fs.h"

convert/source-reiserfs.c

@@ -22,7 +22,7 @@
 #include <limits.h>
 #include <sys/stat.h>
 #include <stdbool.h>
-#include "disk-io.h"
+#include "kernel-shared/disk-io.h"
 #include "transaction.h"
 #include "common/utils.h"
 #include "kernel-lib/bitops.h"

ctree.c

@@ -16,7 +16,7 @@
  * Boston, MA 021110-1307, USA.
  */
 #include "ctree.h"
-#include "disk-io.h"
+#include "kernel-shared/disk-io.h"
 #include "transaction.h"
 #include "kernel-shared/print-tree.h"
 #include "repair.h"

file.c

@@ -19,7 +19,7 @@
 #include <sys/stat.h>
 #include "ctree.h"
 #include "common/utils.h"
-#include "disk-io.h"
+#include "kernel-shared/disk-io.h"
 #include "transaction.h"
 #include "kerncompat.h"
 

find-root.c

@@ -24,7 +24,7 @@
 #include "common/utils.h"
 #include "find-root.h"
 #include "volumes.h"
-#include "disk-io.h"
+#include "kernel-shared/disk-io.h"
 #include "common/extent-cache.h"
 
 /* Return value is the same as btrfs_find_root_search(). */

image/main.c

@@ -30,7 +30,7 @@
 #include "kerncompat.h"
 #include "crypto/crc32c.h"
 #include "ctree.h"
-#include "disk-io.h"
+#include "kernel-shared/disk-io.h"
 #include "transaction.h"
 #include "common/utils.h"
 #include "volumes.h"

inode.c

@@ -26,7 +26,7 @@
 
 #include "ctree.h"
 #include "transaction.h"
-#include "disk-io.h"
+#include "kernel-shared/disk-io.h"
 #include "time.h"
 #include "common/messages.h"
 #include "common/internal.h"

kernel-lib/raid56.c

@@ -25,7 +25,7 @@
 #include <unistd.h>
 #include "kerncompat.h"
 #include "ctree.h"
-#include "disk-io.h"
+#include "kernel-shared/disk-io.h"
 #include "volumes.h"
 #include "common/utils.h"
 #include "kernel-lib/raid56.h"

kernel-shared/backref.c

@@ -18,7 +18,7 @@
 
 #include "kerncompat.h"
 #include "ctree.h"
-#include "disk-io.h"
+#include "kernel-shared/disk-io.h"
 #include "kernel-shared/backref.h"
 #include "kernel-shared/ulist.h"
 #include "transaction.h"

kernel-shared/dir-item.c

@@ -18,7 +18,7 @@
 
 #include <linux/limits.h>
 #include "ctree.h"
-#include "disk-io.h"
+#include "kernel-shared/disk-io.h"
 #include "transaction.h"
 
 static struct btrfs_dir_item *insert_with_overflow(struct btrfs_trans_handle

kernel-shared/disk-io.c

@@ -26,7 +26,7 @@
 #include "kerncompat.h"
 #include "kernel-lib/radix-tree.h"
 #include "ctree.h"
-#include "disk-io.h"
+#include "kernel-shared/disk-io.h"
 #include "volumes.h"
 #include "transaction.h"
 #include "crypto/crc32c.h"

kernel-shared/extent-tree.c

@@ -24,7 +24,7 @@
 #include "kernel-lib/radix-tree.h"
 #include "kernel-lib/rbtree.h"
 #include "ctree.h"
-#include "disk-io.h"
+#include "kernel-shared/disk-io.h"
 #include "kernel-shared/print-tree.h"
 #include "transaction.h"
 #include "crypto/crc32c.h"

kernel-shared/file-item.c

@@ -21,7 +21,7 @@
 #include "kerncompat.h"
 #include "kernel-lib/radix-tree.h"
 #include "ctree.h"
-#include "disk-io.h"
+#include "kernel-shared/disk-io.h"
 #include "transaction.h"
 #include "kernel-shared/print-tree.h"
 #include "crypto/crc32c.h"

kernel-shared/free-space-cache.c

@@ -20,7 +20,7 @@
 #include "ctree.h"
 #include "kernel-shared/free-space-cache.h"
 #include "transaction.h"
-#include "disk-io.h"
+#include "kernel-shared/disk-io.h"
 #include "kernel-shared/extent_io.h"
 #include "crypto/crc32c.h"
 #include "kernel-lib/bitops.h"

kernel-shared/free-space-tree.c

@@ -17,7 +17,7 @@
  */
 
 #include "ctree.h"
-#include "disk-io.h"
+#include "kernel-shared/disk-io.h"
 #include "kernel-shared/free-space-cache.h"
 #include "kernel-shared/free-space-tree.h"
 #include "volumes.h"

kernel-shared/inode-item.c

@@ -17,7 +17,7 @@
  */
 
 #include "ctree.h"
-#include "disk-io.h"
+#include "kernel-shared/disk-io.h"
 #include "transaction.h"
 
 static int find_name_in_backref(struct btrfs_path *path, const char * name,

kernel-shared/print-tree.c

@@ -23,7 +23,7 @@
 #include "kerncompat.h"
 #include "kernel-lib/radix-tree.h"
 #include "ctree.h"
-#include "disk-io.h"
+#include "kernel-shared/disk-io.h"
 #include "kernel-shared/print-tree.h"
 #include "common/utils.h"
 

kernel-shared/root-tree.c

@@ -18,7 +18,7 @@
 
 #include "ctree.h"
 #include "transaction.h"
-#include "disk-io.h"
+#include "kernel-shared/disk-io.h"
 #include "kernel-shared/print-tree.h"
 
 int btrfs_find_last_root(struct btrfs_root *root, u64 objectid,

kernel-shared/uuid-tree.c

@@ -21,7 +21,7 @@
 #include <sys/ioctl.h>
 #include "ctree.h"
 #include "transaction.h"
-#include "disk-io.h"
+#include "kernel-shared/disk-io.h"
 #include "kernel-shared/print-tree.h"
 #include "common/utils.h"
 

mkfs/common.c

@@ -20,7 +20,7 @@
 #include <fcntl.h>
 #include <limits.h>
 #include "ctree.h"
-#include "disk-io.h"
+#include "kernel-shared/disk-io.h"
 #include "volumes.h"
 #include "common/utils.h"
 #include "common/path-utils.h"

mkfs/main.c

@@ -33,7 +33,7 @@
 #include <ctype.h>
 #include <blkid/blkid.h>
 #include "ctree.h"
-#include "disk-io.h"
+#include "kernel-shared/disk-io.h"
 #include "volumes.h"
 #include "transaction.h"
 #include "common/utils.h"

mkfs/rootdir.c

@@ -28,7 +28,7 @@
 #include "ctree.h"
 #include "volumes.h"
 #include "common/internal.h"
-#include "disk-io.h"
+#include "kernel-shared/disk-io.h"
 #include "common/messages.h"
 #include "transaction.h"
 #include "common/utils.h"

quick-test.c

@@ -22,7 +22,7 @@
 #include "kerncompat.h"
 #include "kernel-lib/radix-tree.h"
 #include "ctree.h"
-#include "disk-io.h"
+#include "kernel-shared/disk-io.h"
 #include "kernel-shared/print-tree.h"
 #include "transaction.h"
 

random-test.c

@@ -22,7 +22,7 @@
 #include "kerncompat.h"
 #include "kernel-lib/radix-tree.h"
 #include "ctree.h"
-#include "disk-io.h"
+#include "kernel-shared/disk-io.h"
 #include "kernel-shared/print-tree.h"
 #include "transaction.h"
 

transaction.c

@@ -15,7 +15,7 @@
  */
 
 #include "kerncompat.h"
-#include "disk-io.h"
+#include "kernel-shared/disk-io.h"
 #include "transaction.h"
 #include "kernel-shared/delayed-ref.h"
 #include "common/messages.h"

volumes.c

@@ -23,7 +23,7 @@
 #include <fcntl.h>
 #include <unistd.h>
 #include "ctree.h"
-#include "disk-io.h"
+#include "kernel-shared/disk-io.h"
 #include "transaction.h"
 #include "kernel-shared/print-tree.h"
 #include "volumes.h"