summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Teigland <teigland@redhat.com>2015-07-31 15:46:51 -0500
committerDavid Teigland <teigland@redhat.com>2015-07-31 15:51:50 -0500
commit72f754e2bc571ada133057c5a248162dc349cf93 (patch)
tree477f151ce80e7de41d05e6ab5fcb2241bc67c3b9
parent439a579aa2aaf13c2e420b6e7888dbd71d7021c0 (diff)
downloadlvm2-72f754e2bc571ada133057c5a248162dc349cf93.tar.gz
lockd: remove ignorelockingfailure checks
These code paths were effectively unused. The checks had been added long ago without any real thought behind what they should do or be used for.
-rw-r--r--lib/locking/lvmlockd.c11
1 files changed, 1 insertions, 10 deletions
diff --git a/lib/locking/lvmlockd.c b/lib/locking/lvmlockd.c
index 15abd547a..4e85ec1b5 100644
--- a/lib/locking/lvmlockd.c
+++ b/lib/locking/lvmlockd.c
@@ -1475,11 +1475,7 @@ int lockd_gl(struct cmd_context *cmd, const char *def_mode, uint32_t flags)
log_warn("Duplicate sanlock global locks should be corrected");
if (result < 0) {
- if (ignorelockingfailure()) {
- log_debug("Ignore failed locking for global lock");
- lvmetad_validate_global_cache(cmd, 1);
- return 1;
- } else if (result == -EAGAIN) {
+ if (result == -EAGAIN) {
/*
* Most of the time, retries should avoid this case.
*/
@@ -1770,11 +1766,6 @@ out:
if ((lockd_flags & LD_RF_DUP_GL_LS) && strcmp(mode, "un"))
log_warn("Duplicate sanlock global lock in VG %s", vg_name);
- if (!ret && ignorelockingfailure()) {
- log_debug("Ignore failed locking for VG %s", vg_name);
- return 1;
- }
-
return ret;
}