diff options
| author | Zdenek Kabelac <zkabelac@redhat.com> | 2021-10-01 13:43:46 +0200 |
|---|---|---|
| committer | Zdenek Kabelac <zkabelac@redhat.com> | 2021-10-06 15:39:58 +0200 |
| commit | e30f3c84109b7e131da2497965aee83d73c604e3 (patch) | |
| tree | 9cac77a302429397165583342e26abda8d544bd6 | |
| parent | 8e62cbb18e3206ae5860039c3e1a0d3256e93545 (diff) | |
| download | lvm2-e30f3c84109b7e131da2497965aee83d73c604e3.tar.gz | |
metadata: simplify code
| -rw-r--r-- | lib/metadata/metadata.c | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/lib/metadata/metadata.c b/lib/metadata/metadata.c index 9a7d23365..b3c8c6ece 100644 --- a/lib/metadata/metadata.c +++ b/lib/metadata/metadata.c @@ -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; } /* |