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

metadata: simplify code

Browse Source
This commit is contained in:
Zdenek Kabelac 2021-10-01 13:43:46 +02:00
parent 8e62cbb18e
commit e30f3c8410
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lib/metadata/metadata.c
View File

@ -4977,12 +4977,13 @@ struct volume_group *vg_read(struct cmd_context *cmd, const char *vg_name, const
int writing = (vg_read_flags & READ_FOR_UPDATE);
int activating = (vg_read_flags & READ_FOR_ACTIVATE);
*error_flags = SUCCESS;
if (error_vg)
*error_vg = NULL;
if (is_orphan_vg(vg_name)) {
log_very_verbose("Reading orphan VG %s.", vg_name);
vg = vg_read_orphans(cmd, vg_name);
*error_flags = 0;
if (error_vg)
*error_vg = NULL;
return vg;
}
@ -5240,11 +5241,8 @@ struct volume_group *vg_read(struct cmd_context *cmd, const char *vg_name, const
}
out:
/* We return with the VG lock held when read is successful. */
*error_flags = SUCCESS;
if (error_vg)
*error_vg = NULL;
return vg;
return vg;
bad:
*error_flags = failure;
@ -5273,9 +5271,8 @@ bad:
unlock_vg(cmd, vg, vg_name);
release_vg(vg);
}
if (error_vg)
*error_vg = NULL;
return_NULL;
return NULL;
}
/*