diff options
author | Zdenek Kabelac <zkabelac@redhat.com> | 2018-01-17 15:15:43 +0100 |
---|---|---|
committer | Marian Csontos <mcsontos@redhat.com> | 2018-01-22 19:32:31 +0100 |
commit | e3e7ea0c384da84ccd38406482ec1877c6b19d8a (patch) | |
tree | 8970aaef1e5ec5ab5ab6edac1a620f76a2d0ba81 | |
parent | c3a9e28b2dad569fc39f36e90408a8a8f6357d5a (diff) | |
download | lvm2-dev-mcsontos-el7.tar.gz |
activation: move check laterdev-mcsontos-el7
Check for lv when it's known in all cases.
(cherry picked from commit f3c75bb2014e9ae7d212e0c016a94c529ac8a912)
-rw-r--r-- | lib/activate/activate.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/activate/activate.c b/lib/activate/activate.c index b23400add..18cc7cfbe 100644 --- a/lib/activate/activate.c +++ b/lib/activate/activate.c @@ -2568,6 +2568,12 @@ static int _lv_activate(struct cmd_context *cmd, const char *lvid_s, struct lvinfo info; int r = 0; + if (!activation()) + return 1; + + if (!lv && !(lv_to_free = lv = lv_from_lvid(cmd, lvid_s, 0))) + goto out; + if (!laopts->exclusive && (lv_is_origin(lv) || lv_is_pvmove(lv) || @@ -2578,12 +2584,6 @@ static int _lv_activate(struct cmd_context *cmd, const char *lvid_s, return 0; } - if (!activation()) - return 1; - - if (!lv && !(lv_to_free = lv = lv_from_lvid(cmd, lvid_s, 0))) - goto out; - if (filter && !_passes_activation_filter(cmd, lv)) { log_verbose("Not activating %s since it does not pass " "activation filter.", display_lvname(lv)); |