[Cluster-devel] handle some malloc failures

[Fabio M. Di Nitto]

Applied.. thanks!

Fabio

On Tue, 21 Oct 2008, Jim Meyering wrote:

> "Fabio M. Di Nitto" <fabbione at fabbione.net> wrote:
>> Merged into master branch. I had some issues to get them in the tree
>> so the SHA1 are different from your original posting but it's all
>> there.
>
> Thanks, Fabio.
> Here's a tiny adjustment:
>
>> From 01c30afac0bf97d84df11cc32773304a99613a08 Mon Sep 17 00:00:00 2001
> From: Jim Meyering <meyering at redhat.com>
> Date: Mon, 13 Oct 2008 15:22:55 +0200
> Subject: [PATCH] adjust a diagnostic
>
> * group/dlm_controld/deadlock.c (add_waitfor): Tweak diagnostic.
> ---
> group/dlm_controld/deadlock.c |    2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/group/dlm_controld/deadlock.c b/group/dlm_controld/deadlock.c
> index cdedb87..9eccaae 100644
> --- a/group/dlm_controld/deadlock.c
> +++ b/group/dlm_controld/deadlock.c
> @@ -1340,7 +1340,7 @@ static void add_waitfor(struct lockspace *ls, struct dlm_lkb *waiting_lkb,
> 		new_waitfor = realloc(tr->waitfor,
> 				      tr->waitfor_alloc * sizeof(*tr->waitfor));
> 		if (new_waitfor == NULL) {
> -			log_group(ls, "failed to allocate ...");
> +			log_group(ls, "failed to allocate internal buffer");
> 			free (tr->waitfor);
> 			return;
> 		}
> --
> 1.6.0.2.588.g3102
>


--
I'm going to make him an offer he can't refuse.