fix compile warnings

4 files changed, 21 insertions, 13 deletions

diff --git a/daemons/lvmlockd/lvmlockctl.c b/daemons/lvmlockd/lvmlockctl.c
index d42ebb21e..f9d6cf98b 100644
--- a/daemons/lvmlockd/lvmlockctl.c
+++ b/daemons/lvmlockd/lvmlockctl.c
@@ -407,8 +407,10 @@ static int do_dump(const char *req_name)
 
 	daemon_reply_destroy(reply);
 
-	if (result < 0)
+	if (result < 0) {
+		rv = result;
 		log_error("result %d", result);
+	}
 
 	if (!dump_len)
 		goto out;
diff --git a/daemons/lvmlockd/lvmlockd-core.c b/daemons/lvmlockd/lvmlockd-core.c
index d7e98abb2..be4fc45cc 100644
--- a/daemons/lvmlockd/lvmlockd-core.c
+++ b/daemons/lvmlockd/lvmlockd-core.c
@@ -1509,11 +1509,11 @@ static void res_process(struct lockspace *ls, struct resource *r,
 			act->result = rv;
 			list_del(&act->list);
 			add_client_result(act);
-		}
 
-		if (!rv && act->op == LD_OP_DISABLE) {
-			log_debug("S %s R %s free disabled", ls->name, r->name);
-			goto r_free;
+			if (!rv && act->op == LD_OP_DISABLE) {
+				log_debug("S %s R %s free disabled", ls->name, r->name);
+				goto r_free;
+			}
 		}
 	}
 
@@ -3246,7 +3246,10 @@ static struct client *find_client_pi(int pi)
  */
 static void restart_poll(void)
 {
-	write(restart_fds[1], "w", 1);
+	int rv;
+	rv = write(restart_fds[1], "w", 1);
+	if (!rv || rv < 0)
+		log_debug("restart_poll write %d", errno);
 }
 
 /* poll will take requests from client again, cl->mutex must be held */
@@ -5376,8 +5379,13 @@ static int setup_restart(void)
 static void process_restart(int fd)
 {
 	char wake[1];
+	int rv;
+
 	/* assert fd == restart_fds[0] */
-	read(restart_fds[0], wake, 1);
+
+	rv = read(restart_fds[0], wake, 1);
+	if (!rv || rv < 0)
+		log_debug("process_restart error %d", errno);
 }
 
 static void sigterm_handler(int sig __attribute__((unused)))
diff --git a/daemons/lvmlockd/lvmlockd-dlm.c b/daemons/lvmlockd/lvmlockd-dlm.c
index b544bddc9..04336fd66 100644
--- a/daemons/lvmlockd/lvmlockd-dlm.c
+++ b/daemons/lvmlockd/lvmlockd-dlm.c
@@ -304,12 +304,10 @@ int lm_rem_resource_dlm(struct lockspace *ls, struct resource *r)
 	struct lm_dlm *lmd = (struct lm_dlm *)ls->lm_data;
 	struct rd_dlm *rdd = (struct rd_dlm *)r->lm_data;
 	struct dlm_lksb *lksb;
-	int rv;
+	int rv = 0;
 
-	if (daemon_test) {
-		rv = 0;
+	if (daemon_test)
 		goto out;
-	}
 
 	lksb = &rdd->lksb;
 
diff --git a/daemons/lvmlockd/lvmlockd-sanlock.c b/daemons/lvmlockd/lvmlockd-sanlock.c
index 80f5dc082..fa7ad8ab2 100644
--- a/daemons/lvmlockd/lvmlockd-sanlock.c
+++ b/daemons/lvmlockd/lvmlockd-sanlock.c
@@ -298,7 +298,7 @@ int lm_init_vg_sanlock(char *ls_name, char *vg_name, uint32_t flags, char *vg_ar
 	if (daemon_test) {
 		if (!gl_lsname_sanlock[0])
 			strncpy(gl_lsname_sanlock, ls_name, MAX_NAME);
-		goto out;
+		return 0;
 	}
 
 	rv = sanlock_version(0, &daemon_version, &daemon_proto);
@@ -375,7 +375,7 @@ int lm_init_vg_sanlock(char *ls_name, char *vg_name, uint32_t flags, char *vg_ar
 
 	if (!strcmp(gl_name, R_NAME_GL))
 		strncpy(gl_lsname_sanlock, ls_name, MAX_NAME);
- out:
+ 
 	snprintf(vg_args, MAX_ARGS, "%s:%s", lock_args_version, lock_lv_name);
 
 	log_debug("S %s init_vg_san done vg_args %s", ls_name, vg_args);