1.00.21

WHATS_NEW

@@ -5,6 +5,7 @@ Version 2.00.33 -
   gulm clvmd now doesn't ignore the first node in cluster.conf
   Improve clvmd failure message if it's already running.
   Allow user to kill clvmd during initialisation.
+  Fix off-by-one error in cluster_locking that could cause read hangs.
 
 Version 2.00.32 - 22nd December 2004
 ====================================

WHATS_NEW_DM

@@ -1,3 +1,7 @@
+Version 1.00.21 - 7 Jan 2005
+============================
+  Fix /proc/devices parsing.
+
 Version 1.00.20 - 6 Jan 2005
 ============================
   Attempt to fix /dev/mapper/control transparently if it's wrong.

daemons/clvmd/clvmd.c

@@ -1313,6 +1313,7 @@ static void *pre_and_post_thread(void *arg)
 
 		DEBUGLOG("Got post command condition...\n");
 
+		status = 0;
 		do_post_command(client);
 
 		write(pipe_fd, &status, sizeof(int));

lib/locking/cluster_locking.c

@@ -139,8 +139,7 @@ static int _send_request(char *inbuf, int inlen, char **retbuf)
 
 	/* Read the returned values */
 	off = 1;		/* we've already read the first byte */
-
-	while (off < outheader->arglen && len > 0) {
+	while (off <= outheader->arglen && len > 0) {
 		len = read(_clvmd_sock, outheader->args + off,
 			   buflen - off - offsetof(struct clvm_header, args));
 		if (len > 0)
@@ -150,7 +149,7 @@ static int _send_request(char *inbuf, int inlen, char **retbuf)
 	/* Was it an error ? */
 	if (outheader->status < 0) {
 		errno = -outheader->status;
-		log_error("cluster send request failed: %s", strerror(errno));
+		log_error("cluster request failed: %s", strerror(errno));
 		return 0;
 	}
 

libdm/ioctl/libdm-iface.c

@@ -134,8 +134,7 @@ static int _get_proc_number(const char *file, const char *name,
 				fclose(fl);
 				return 1;
 			}
-		}
-		do {
+		} else do {
 			c = fgetc(fl);
 		} while (c != EOF && c != '\n');
 	}