diff options
| author | Zdenek Kabelac <zkabelac@redhat.com> | 2015-11-17 13:15:39 +0100 |
|---|---|---|
| committer | Zdenek Kabelac <zkabelac@redhat.com> | 2015-11-17 19:01:25 +0100 |
| commit | 6e71d3fbde344c26f8301dbd9550a110d5bc7ac4 (patch) | |
| tree | 716c597f2ca657c4ad067cf5164c472c5cf28bad | |
| parent | d8049dd17a50b704edea69c968305aee732cb256 (diff) | |
| download | lvm2-6e71d3fbde344c26f8301dbd9550a110d5bc7ac4.tar.gz | |
cleanup: more readable code
Simplify if() expression.
Rename 'this' to 'vg'..
| -rw-r--r-- | lib/cache/lvmetad.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/lib/cache/lvmetad.c b/lib/cache/lvmetad.c index d300d3920..dced80a14 100644 --- a/lib/cache/lvmetad.c +++ b/lib/cache/lvmetad.c @@ -1187,16 +1187,17 @@ struct _lvmetad_pvscan_baton { static int _lvmetad_pvscan_single(struct metadata_area *mda, void *baton) { struct _lvmetad_pvscan_baton *b = baton; - struct volume_group *this; + struct volume_group *vg; - if (!(this = mda_is_ignored(mda) ? NULL : mda->ops->vg_read(b->fid, "", mda, NULL, NULL, 1))) + if (mda_is_ignored(mda) || + !(vg = mda->ops->vg_read(b->fid, "", mda, NULL, NULL, 1))) return 1; /* FIXME Also ensure contents match etc. */ - if (!b->vg || this->seqno > b->vg->seqno) - b->vg = this; + if (!b->vg || vg->seqno > b->vg->seqno) + b->vg = vg; else if (b->vg) - release_vg(this); + release_vg(vg); return 1; } |