Attachment 297921 Details for Bug 435341 – Patch for testing

[patch] Patch for testing

clvmd-race.patch (text/plain), 1.03 KB, created by Christine Caulfield on 2008-03-13 11:22:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Christine Caulfield

Created: 2008-03-13 11:22:14 UTC

Size: 1.03 KB

patch

obsolete

>Index: clvmd.c
>===================================================================
>RCS file: /cvs/lvm2/LVM2/daemons/clvmd/clvmd.c,v
>retrieving revision 1.43
>diff -u -p -r1.43 clvmd.c
>--- clvmd.c	6 Mar 2008 08:41:05 -0000	1.43
>+++ clvmd.c	13 Mar 2008 11:19:30 -0000
>@@ -1416,7 +1416,8 @@ next_pre:
> 		DEBUGLOG("Waiting for next pre command\n");
> 
> 		pthread_mutex_lock(&client->bits.localsock.mutex);
>-		if (client->bits.localsock.state != PRE_COMMAND) {
>+		if (client->bits.localsock.state != PRE_COMMAND &&
>+		    !client->bits.localsock.finished) {
> 			pthread_cond_wait(&client->bits.localsock.cond,
> 					  &client->bits.localsock.mutex);
> 		}
>@@ -1822,8 +1823,9 @@ static int open_local_sock()
> 		log_error("Can't create local socket: %m");
> 		return -1;
> 	}
>-	/* Set Close-on-exec */
>+	/* Set Close-on-exec & non-blocking */
> 	fcntl(local_socket, F_SETFD, 1);
>+	fcntl(local_socket, F_SETFL, fcntl(local_socket, F_GETFL, 0) | O_NONBLOCK);
> 
> 	memset(&sockaddr, 0, sizeof(sockaddr));
> 	memcpy(sockaddr.sun_path, CLVMD_SOCKNAME, sizeof(CLVMD_SOCKNAME));

Actions: View | Diff

Attachments on bug 435341: 296619 | 296752 | 296753 | 297921