Attachment 203561 Details for Bug 302341 – initializes my_new_memb in entrance to commit state instead of recovery state.

[patch] initializes my_new_memb in entrance to commit state instead of recovery state.

totemsrp_uninitialized_fix.patch (text/plain), 1.02 KB, created by Steven Dake on 2007-09-23 20:06:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Steven Dake

Created: 2007-09-23 20:06:40 UTC

Size: 1.02 KB

patch

obsolete

>Index: totemsrp.c
>===================================================================
>--- totemsrp.c	(revision 1454)
>+++ totemsrp.c	(working copy)
>@@ -1804,15 +1820,10 @@
> 	/*
> 	 * Build regular configuration
> 	 */
>-	instance->my_new_memb_entries = commit_token->addr_entries;
>-
>  	totemrrp_processor_count_set (
> 		instance->totemrrp_handle,
> 		commit_token->addr_entries);
> 
>-	memcpy (instance->my_new_memb_list, addr,
>-		sizeof (struct srp_addr) * instance->my_new_memb_entries);
>-
> 	/*
> 	 * Build transitional configuration
> 	 */
>@@ -2623,6 +2634,11 @@
> 	addr = (struct srp_addr *)commit_token->end_of_commit_token;
> 	memb_list = (struct memb_commit_token_memb_entry *)(addr + commit_token->addr_entries);
> 
>+	memcpy (instance->my_new_memb_list, addr,
>+		sizeof (struct srp_addr) * commit_token->addr_entries);
>+
>+	instance->my_new_memb_entries = commit_token->addr_entries;
>+
> 	memb_ring_id_copy (&memb_list[commit_token->memb_index].ring_id,
> 		&instance->my_old_ring_id);
> 	assert (!totemip_zero_check(&instance->my_old_ring_id.rep));

Actions: View | Diff

Attachments on bug 302341: 203561