diff options
| author | David Teigland <teigland@redhat.com> | 2015-08-18 10:39:40 -0500 |
|---|---|---|
| committer | David Teigland <teigland@redhat.com> | 2015-08-18 11:18:40 -0500 |
| commit | 7b570840cd5c503ff55a446e211ac30bb09ef3fd (patch) | |
| tree | 1bb410b87081babe63f9e9a5f3b9e9da82e768a2 /tools/polldaemon.c | |
| parent | c1bd76d6fcbbc7c07c99a5738dea99f830f79810 (diff) | |
| download | lvm2-7b570840cd5c503ff55a446e211ac30bb09ef3fd.tar.gz | |
lockd: no error when unlock fails
The unlock call will fail in expected and normal cases,
and should not cause the command to fail. (An actual
unlock in the lock manager should never fail.)
Diffstat (limited to 'tools/polldaemon.c')
| -rw-r--r-- | tools/polldaemon.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/tools/polldaemon.c b/tools/polldaemon.c index c7f67950b..cee1983f2 100644 --- a/tools/polldaemon.c +++ b/tools/polldaemon.c @@ -203,7 +203,7 @@ int wait_for_single_lv(struct cmd_context *cmd, struct poll_operation_id *id, unlock_and_release_vg(cmd, vg, vg->name); if (!lockd_vg(cmd, id->vg_name, "un", 0, &lockd_state)) - return_0; + stack; /* * FIXME Sleeping after testing, while preferred, also works around @@ -226,10 +226,8 @@ int wait_for_single_lv(struct cmd_context *cmd, struct poll_operation_id *id, out: if (vg) unlock_and_release_vg(cmd, vg, vg->name); - if (!lockd_vg(cmd, id->vg_name, "un", 0, &lockd_state)) { + if (!lockd_vg(cmd, id->vg_name, "un", 0, &lockd_state)) stack; - ret = 0; - } return ret; } |