shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-01-03 05:18:29 +03:00
Code Releases Activity

o chagngesd alloc to return 0 on success

Browse Source
This commit is contained in:
Joe Thornber 2001-08-22 15:59:56 +00:00
parent 016cf45775
commit 1a6f055682
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
driver/device-mapper/dm-table.c
View File

@ -84,11 +84,12 @@ void dm_free_table(struct mapped_device *md)
int dm_start_table(struct mapped_device *md) int dm_start_table(struct mapped_device *md)
{ {
int r;
set_bit(DM_LOADING, &md->state); set_bit(DM_LOADING, &md->state);
dm_free_table(md); dm_free_table(md);
if (!_alloc_targets(md, 2)) /* FIXME: increase once debugged 256 ? */ if ((r = _alloc_targets(md, 2))) /* FIXME: increase once debugged 256 ? */
return -ENOMEM; return r;
return 0; return 0;
} }
@ -148,17 +149,17 @@ static int _alloc_targets(struct mapped_device *md, int num)
void **n_contexts; void **n_contexts;
if (!(n_highs = vmalloc(sizeof(*n_highs) * num))) if (!(n_highs = vmalloc(sizeof(*n_highs) * num)))
return 0; return -ENOMEM;
if (!(n_targets = vmalloc(sizeof(*n_targets) * num))) { if (!(n_targets = vmalloc(sizeof(*n_targets) * num))) {
vfree(n_highs); vfree(n_highs);
return 0; return -ENOMEM;
} }
if (!(n_contexts = vmalloc(sizeof(*n_contexts) * num))) { if (!(n_contexts = vmalloc(sizeof(*n_contexts) * num))) {
vfree(n_highs); vfree(n_highs);
vfree(n_targets); vfree(n_targets);
return 0; return -ENOMEM;
} }
memcpy(n_highs, md->highs, sizeof(*n_highs) * md->num_targets); memcpy(n_highs, md->highs, sizeof(*n_highs) * md->num_targets);
@ -175,5 +176,5 @@ static int _alloc_targets(struct mapped_device *md, int num)
md->targets = n_targets; md->targets = n_targets;
md->contexts = n_contexts; md->contexts = n_contexts;
return 1; return 0;
} }