c8h4/btrfs-progs
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

btrfs-progs: deal with malloc failure in btrfs-image

Browse source 
Handle the malloc failure for dump_worker in the same way as
the restore worker.

Signed-off-by: Gui Hecheng <guihc.fnst@cn.fujitsu.com>
Signed-off-by: David Sterba <dsterba@suse.cz>
This commit is contained in:
Gui Hecheng 2014-06-26 10:53:02 +08:00 committed by David Sterba
parent ad70b55b66
commit aada050961
1 changed files with 18 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
btrfs-image.c
View file

@ -107,6 +107,8 @@ struct metadump_struct {
int done;
int data;
int sanitize_names;
int error;
};
struct name {
@ -602,6 +604,14 @@ static void *dump_worker(void *data)
async->bufsize = compressBound(async->size);
async->buffer = malloc(async->bufsize);
if (!async->buffer) {
fprintf(stderr, "Error allocing buffer\n");
pthread_mutex_lock(&md->mutex);
if (!md->error)
md->error = -ENOMEM;
pthread_mutex_unlock(&md->mutex);
pthread_exit(NULL);
}
ret = compress2(async->buffer,
(unsigned long *)&async->bufsize,
@ -736,7 +746,7 @@ static int write_buffers(struct metadump_struct *md, u64 *next)
goto out;
/* wait until all buffers are compressed */
while (md->num_items > md->num_ready) {
while (!err && md->num_items > md->num_ready) {
struct timespec ts = {
.tv_sec = 0,
.tv_nsec = 10000000,
@ -744,6 +754,13 @@ static int write_buffers(struct metadump_struct *md, u64 *next)
pthread_mutex_unlock(&md->mutex);
nanosleep(&ts, NULL);
pthread_mutex_lock(&md->mutex);
err = md->error;
}
if (err) {
fprintf(stderr, "One of the threads errored out %s\n",
strerror(err));
goto out;
}
/* setup and write index block */