summaryrefslogtreecommitdiff
path: root/tools/pvmove.c
diff options
context:
space:
mode:
authorDavid Teigland <teigland@redhat.com>2015-08-18 10:39:40 -0500
committerDavid Teigland <teigland@redhat.com>2015-08-18 11:18:40 -0500
commit7b570840cd5c503ff55a446e211ac30bb09ef3fd (patch)
tree1bb410b87081babe63f9e9a5f3b9e9da82e768a2 /tools/pvmove.c
parentc1bd76d6fcbbc7c07c99a5738dea99f830f79810 (diff)
downloadlvm2-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/pvmove.c')
-rw-r--r--tools/pvmove.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/tools/pvmove.c b/tools/pvmove.c
index 849780afe..0e31764a2 100644
--- a/tools/pvmove.c
+++ b/tools/pvmove.c
@@ -712,10 +712,8 @@ out_ret:
* for some time monitoring the progress, and we don not want
* or need the lockd lock held over that.
*/
- if (!lockd_vg(cmd, vg_name, "un", 0, &lockd_state)) {
+ if (!lockd_vg(cmd, vg_name, "un", 0, &lockd_state))
stack;
- r = ECMD_FAILED;
- }
return r;
}
@@ -765,10 +763,8 @@ static int _read_poll_id_from_pvname(struct cmd_context *cmd, const char *pv_nam
unlock_and_release_vg(cmd, vg, vg_name);
out:
- if (!lockd_vg(cmd, vg_name, "un", 0, &lockd_state)) {
+ if (!lockd_vg(cmd, vg_name, "un", 0, &lockd_state))
stack;
- ret = 0;
- }
free_pv_fid(pv);
return ret;
}