diff options
| author | David Teigland <teigland@redhat.com> | 2018-06-05 13:21:28 -0500 |
|---|---|---|
| committer | Joe Thornber <ejt@redhat.com> | 2018-06-07 16:17:04 +0100 |
| commit | 18259d5559307f2708e12b9923988319e46572df (patch) | |
| tree | 2dcc99651e6af935ae2e3b2c96bbe72d36f9f470 /tools/polldaemon.c | |
| parent | e4d9099e19591a7f3ad546c180b59a601e0d03da (diff) | |
| download | lvm2-18259d5559307f2708e12b9923988319e46572df.tar.gz | |
Remove unused clvm variations for active LVs
Different flavors of activate_lv() and lv_is_active()
which are meaningful in a clustered VG can be eliminated
and replaced with whatever that flavor already falls back
to in a local VG.
e.g. lv_is_active_exclusive_locally() is distinct from
lv_is_active() in a clustered VG, but in a local VG they
are equivalent. So, all instances of the variant are
replaced with the basic local equivalent.
For local VGs, the same behavior remains as before.
For shared VGs, lvmlockd was written with the explicit
requirement of local behavior from these functions
(lvmlockd requires locking_type 1), so the behavior
in shared VGs also remains the same.
Diffstat (limited to 'tools/polldaemon.c')
| -rw-r--r-- | tools/polldaemon.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/polldaemon.c b/tools/polldaemon.c index bd99c7ba2..7ad45ca29 100644 --- a/tools/polldaemon.c +++ b/tools/polldaemon.c @@ -200,7 +200,7 @@ int wait_for_single_lv(struct cmd_context *cmd, struct poll_operation_id *id, * If the LV is not active locally, the kernel cannot be * queried for its status. We must exit in this case. */ - if (!lv_is_active_locally(lv)) { + if (!lv_is_active(lv)) { log_print_unless_silent("%s: Interrupted: No longer active.", id->display_name); ret = 1; goto out; @@ -440,7 +440,7 @@ static int _report_progress(struct cmd_context *cmd, struct poll_operation_id *i goto out; } - if (!lv_is_active_locally(lv)) { + if (!lv_is_active(lv)) { log_verbose("%s: Interrupted: No longer active.", id->display_name); ret = 1; goto out; |