RepoMirrors/btrfs-progs
1
0
Fork 0
mirror of https://github.com/kdave/btrfs-progs synced 2024-12-25 15:42:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

btrfs-progs: image: use embedded array for metadump cluster buffer

Browse Source 
Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
David Sterba 2016-11-03 01:23:18 +01:00
parent acd2580777
commit a7d8850f9f
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
btrfs-image.c
View File

@ -97,7 +97,10 @@ struct metadump_struct {
struct btrfs_root *root; struct btrfs_root *root;
FILE *out; FILE *out;
struct meta_cluster *cluster; union {
struct meta_cluster cluster;
char meta_cluster_bytes[BLOCK_SIZE];
};
pthread_t threads[MAX_WORKER_THREADS]; pthread_t threads[MAX_WORKER_THREADS];
size_t num_threads; size_t num_threads;
@ -705,7 +708,7 @@ static void meta_cluster_init(struct metadump_struct *md, u64 start)
md->num_items = 0; md->num_items = 0;
md->num_ready = 0; md->num_ready = 0;
header = &md->cluster->header; header = &md->cluster.header;
header->magic = cpu_to_le64(HEADER_MAGIC); header->magic = cpu_to_le64(HEADER_MAGIC);
header->bytenr = cpu_to_le64(start); header->bytenr = cpu_to_le64(start);
header->nritems = cpu_to_le32(0); header->nritems = cpu_to_le32(0);
@ -738,7 +741,6 @@ static void metadump_destroy(struct metadump_struct *md, int num_threads)
free(name->sub); free(name->sub);
free(name); free(name);
} }
free(md->cluster);
} }
static int metadump_init(struct metadump_struct *md, struct btrfs_root *root, static int metadump_init(struct metadump_struct *md, struct btrfs_root *root,
@ -748,9 +750,6 @@ static int metadump_init(struct metadump_struct *md, struct btrfs_root *root,
int i, ret = 0; int i, ret = 0;
memset(md, 0, sizeof(*md)); memset(md, 0, sizeof(*md));
md->cluster = calloc(1, BLOCK_SIZE);
if (!md->cluster)
return -ENOMEM;
INIT_LIST_HEAD(&md->list); INIT_LIST_HEAD(&md->list);
INIT_LIST_HEAD(&md->ordered); INIT_LIST_HEAD(&md->ordered);
md->root = root; md->root = root;
@ -790,7 +789,7 @@ static int write_zero(FILE *out, size_t size)
static int write_buffers(struct metadump_struct *md, u64 *next) static int write_buffers(struct metadump_struct *md, u64 *next)
{ {
struct meta_cluster_header *header = &md->cluster->header; struct meta_cluster_header *header = &md->cluster.header;
struct meta_cluster_item *item; struct meta_cluster_item *item;
struct async_work *async; struct async_work *async;
u64 bytenr = 0; u64 bytenr = 0;
@ -820,14 +819,14 @@ static int write_buffers(struct metadump_struct *md, u64 *next)
/* setup and write index block */ /* setup and write index block */
list_for_each_entry(async, &md->ordered, ordered) { list_for_each_entry(async, &md->ordered, ordered) {
item = md->cluster->items + nritems; item = &md->cluster.items[nritems];
item->bytenr = cpu_to_le64(async->start); item->bytenr = cpu_to_le64(async->start);
item->size = cpu_to_le32(async->bufsize); item->size = cpu_to_le32(async->bufsize);
nritems++; nritems++;
} }
header->nritems = cpu_to_le32(nritems); header->nritems = cpu_to_le32(nritems);
ret = fwrite(md->cluster, BLOCK_SIZE, 1, md->out); ret = fwrite(&md->cluster, BLOCK_SIZE, 1, md->out);
if (ret != 1) { if (ret != 1) {
error("unable to write out cluster: %s", strerror(errno)); error("unable to write out cluster: %s", strerror(errno));
return -errno; return -errno;