Skip to content

Commit

Permalink
pre-release
Browse files Browse the repository at this point in the history
  • Loading branch information
kergon committed Nov 8, 2010
1 parent 262ff6e commit ab3b542
Show file tree
Hide file tree
Showing 5 changed files with 23 additions and 19 deletions.
2 changes: 1 addition & 1 deletion VERSION
@@ -1 +1 @@
2.02.76(2)-cvs (2010-10-25)
2.02.76(2)-cvs (2010-11-08)
2 changes: 1 addition & 1 deletion VERSION_DM
@@ -1 +1 @@
1.02.57-cvs (2010-10-25)
1.02.57-cvs (2010-11-08)
8 changes: 4 additions & 4 deletions WHATS_NEW
@@ -1,16 +1,16 @@
Version 2.02.76 -
Version 2.02.76 - 8th November 2010
===================================
Clarify error messages when activation fails due to activation filter use.
Add initial script VolumeGroup.ocf for pacemaker support.
Fix regex optimiser not to ignore RHS of OR nodes in _find_leftmost_common.
Add pacemaker script VolumeGroup.ocf with configure --enable-ocf.
Import make.tmpl into include/ Makefile.
Fix handling of online filesystem resize (using new fsadm return code).
Add DIAGNOSTICS section to fsadm man page.
Modify fsadm to return different status code for check of mounted filesystem.
Update VG metadata only once in vgchange when making multiple changes.
Allow independent vgchange arguments to be used together.
Automatically unmount invalidated snapshots in dmeventd.
Suppress some superfluous messages from clang static analysis.
Fix a deadlock caused by double close in clvmd.
Add dmeventd -R to restart dmeventd without losing monitoring state. (2.02.75)
Fix NULL pointer dereference on too-large MDA error path in _vg_read_raw_area.
Use static for internal _align_chunk() and _new_chunk() from pool-fast.c.
Fix vgchange to process -a, --refresh, --monitor and --poll like lvchange.
Expand Down
4 changes: 3 additions & 1 deletion WHATS_NEW_DM
@@ -1,5 +1,7 @@
Version 1.02.57
Version 1.02.57 - 8th November 2010
===================================
Fix regex optimiser not to ignore RHS of OR nodes in _find_leftmost_common.
Add dmeventd -R to restart dmeventd without losing monitoring state. (1.02.56)
Fix memory leak of field_id in _output_field function.
Allocate buffer for reporting functions dynamically to support long outputs.

Expand Down
26 changes: 14 additions & 12 deletions daemons/clvmd/clvmd.c
Expand Up @@ -184,8 +184,12 @@ static void child_init_signal(int status)
write(child_pipe[1], &status, sizeof(status));
close(child_pipe[1]);
}
if (status)
exit(status);
}

static __attribute__((noreturn)) void child_init_signal_and_exit(int status)
{
child_init_signal(status);
exit(status);
}

static void safe_close(int *fd)
Expand Down Expand Up @@ -420,8 +424,10 @@ int main(int argc, char *argv[])
potential clients will block rather than error if we are running
but the cluster is not ready yet */
local_sock = open_local_sock();
if (local_sock < 0)
child_init_signal(DFAIL_LOCAL_SOCK);
if (local_sock < 0) {
child_init_signal_and_exit(DFAIL_LOCAL_SOCK);
/* NOTREACHED */
}

/* Set up signal handlers, USR1 is for cluster change notifications (in cman)
USR2 causes child threads to exit.
Expand Down Expand Up @@ -498,10 +504,8 @@ int main(int argc, char *argv[])
if (!clops) {
DEBUGLOG("Can't initialise cluster interface\n");
log_error("Can't initialise cluster interface\n");
child_init_signal(DFAIL_CLUSTER_IF);
#ifdef __clang__
__builtin_unreachable();
#endif
child_init_signal_and_exit(DFAIL_CLUSTER_IF);
/* NOTREACHED */
}
DEBUGLOG("Cluster ready, doing some more initialisation\n");

Expand All @@ -517,10 +521,8 @@ int main(int argc, char *argv[])
/* Add the local socket to the list */
newfd = malloc(sizeof(struct local_client));
if (!newfd) {
child_init_signal(DFAIL_MALLOC);
#ifdef __clang__
__builtin_unreachable();
#endif
child_init_signal_and_exit(DFAIL_MALLOC);
/* NOTREACHED */
}

newfd->fd = local_sock;
Expand Down

0 comments on commit ab3b542

Please sign in to comment.