From c76b05fba284c68c6cb7b710dbb95a42089e8538 Mon Sep 17 00:00:00 2001 From: David Sterba Date: Fri, 20 Oct 2017 00:24:13 +0200 Subject: [PATCH] btrfs-progs: image: move metadump definitions to own header Signed-off-by: David Sterba --- image/main.c | 46 +------------------------------ image/metadump.h | 70 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 71 insertions(+), 45 deletions(-) create mode 100644 image/metadump.h diff --git a/image/main.c b/image/main.c index 4cffbdba..4557f963 100644 --- a/image/main.c +++ b/image/main.c @@ -36,54 +36,10 @@ #include "volumes.h" #include "extent_io.h" #include "help.h" - -#define HEADER_MAGIC 0xbd5c25e27295668bULL -#define MAX_PENDING_SIZE (256 * 1024) -#define BLOCK_SIZE 1024 -#define BLOCK_MASK (BLOCK_SIZE - 1) - -#define COMPRESS_NONE 0 -#define COMPRESS_ZLIB 1 +#include "image/metadump.h" #define MAX_WORKER_THREADS (32) -struct meta_cluster_item { - __le64 bytenr; - __le32 size; -} __attribute__ ((__packed__)); - -struct meta_cluster_header { - __le64 magic; - __le64 bytenr; - __le32 nritems; - u8 compress; -} __attribute__ ((__packed__)); - -/* cluster header + index items + buffers */ -struct meta_cluster { - struct meta_cluster_header header; - struct meta_cluster_item items[]; -} __attribute__ ((__packed__)); - -#define ITEMS_PER_CLUSTER ((BLOCK_SIZE - sizeof(struct meta_cluster)) / \ - sizeof(struct meta_cluster_item)) - -struct fs_chunk { - u64 logical; - u64 physical; - /* - * physical_dup only store additonal physical for BTRFS_BLOCK_GROUP_DUP - * currently restore only support single and DUP - * TODO: modify this structure and the function related to this - * structure for support RAID* - */ - u64 physical_dup; - u64 bytes; - struct rb_node l; - struct rb_node p; - struct list_head list; -}; - struct async_work { struct list_head list; struct list_head ordered; diff --git a/image/metadump.h b/image/metadump.h new file mode 100644 index 00000000..b9275e95 --- /dev/null +++ b/image/metadump.h @@ -0,0 +1,70 @@ +/* + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public + * License v2 as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 021110-1307, USA. + */ + +#ifndef __BTRFS_IMAGE_METADUMP_H__ +#define __BTRFS_IMAGE_METADUMP_H__ + +#include "kerncompat.h" +#include "kernel-lib/rbtree.h" +#include "kernel-lib/list.h" +#include "ctree.h" + +#define HEADER_MAGIC 0xbd5c25e27295668bULL +#define MAX_PENDING_SIZE (256 * 1024) +#define BLOCK_SIZE 1024 +#define BLOCK_MASK (BLOCK_SIZE - 1) + +#define ITEMS_PER_CLUSTER ((BLOCK_SIZE - sizeof(struct meta_cluster)) / \ + sizeof(struct meta_cluster_item)) + +#define COMPRESS_NONE 0 +#define COMPRESS_ZLIB 1 + +struct meta_cluster_item { + __le64 bytenr; + __le32 size; +} __attribute__ ((__packed__)); + +struct meta_cluster_header { + __le64 magic; + __le64 bytenr; + __le32 nritems; + u8 compress; +} __attribute__ ((__packed__)); + +/* cluster header + index items + buffers */ +struct meta_cluster { + struct meta_cluster_header header; + struct meta_cluster_item items[]; +} __attribute__ ((__packed__)); + +struct fs_chunk { + u64 logical; + u64 physical; + /* + * physical_dup only store additonal physical for BTRFS_BLOCK_GROUP_DUP + * currently restore only support single and DUP + * TODO: modify this structure and the function related to this + * structure for support RAID* + */ + u64 physical_dup; + u64 bytes; + struct rb_node l; + struct rb_node p; + struct list_head list; +}; + +#endif