diff options
| author | Alasdair Kergon <agk@redhat.com> | 2007-04-26 16:44:59 +0000 |
|---|---|---|
| committer | Alasdair Kergon <agk@redhat.com> | 2007-04-26 16:44:59 +0000 |
| commit | 4f2f566b064ba1e67e95bf26a22f2e7d492b649c (patch) | |
| tree | 461758c5ee043caa07bae34174ac5836824f239b /lib/format_text/import_vsn1.c | |
| parent | 867c3249cb7d0ffc067984bfeeb868d7c52a67ad (diff) | |
| download | lvm2-4f2f566b064ba1e67e95bf26a22f2e7d492b649c.tar.gz | |
Add devices/preferred_names config regex list for displayed device names.
Free a temporary dir string in fcntl_lock_file() after use.
Fix a dm_pool_destroy() in matcher_create().
Introduce goto_bad macro.
Diffstat (limited to 'lib/format_text/import_vsn1.c')
| -rw-r--r-- | lib/format_text/import_vsn1.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/lib/format_text/import_vsn1.c b/lib/format_text/import_vsn1.c index c1b529446..047706654 100644 --- a/lib/format_text/import_vsn1.c +++ b/lib/format_text/import_vsn1.c @@ -660,15 +660,11 @@ static struct volume_group *_read_vg(struct format_instance *fid, /* eg Set to instance of fmt1 here if reading a format1 backup? */ vg->fid = fid; - if (!(vg->name = dm_pool_strdup(mem, vgn->key))) { - stack; - goto bad; - } + if (!(vg->name = dm_pool_strdup(mem, vgn->key))) + goto_bad; - if (!(vg->system_id = dm_pool_zalloc(mem, NAME_LEN))) { - stack; - goto bad; - } + if (!(vg->system_id = dm_pool_zalloc(mem, NAME_LEN))) + goto_bad; vgn = vgn->child; |