From mboxrd@z Thu Jan  1 00:00:00 1970
From: Steven Whitehouse <swhiteho@redhat.com>
Date: Mon, 16 Jul 2007 09:48:50 +0100
Subject: [Cluster-devel] Re: [PATCH] dlm: fix NULL ls usage
In-Reply-To: <20070713194906.GB16274@redhat.com>
References: <20070713194906.GB16274@redhat.com>
Message-ID: <1184575730.8765.303.camel@quoit>
List-Id: <cluster-devel.redhat.com>
To: cluster-devel.redhat.com
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

Hi,

Now in the -nmw GFS2 git tree. Thanks,

Steve.

On Fri, 2007-07-13 at 14:49 -0500, David Teigland wrote:
> Fix regression in recent patch "[DLM] variable allocation" which
> attempts to dereference an "ls" struct when it's NULL.
> 
> Signed-off-by: David Teigland <teigland@redhat.com>
> 
> Index: linux-quilt/fs/dlm/rcom.c
> ===================================================================
> --- linux-quilt.orig/fs/dlm/rcom.c	2007-06-06 08:48:33.000000000 -0500
> +++ linux-quilt/fs/dlm/rcom.c	2007-07-13 14:42:19.000000000 -0500
> @@ -386,8 +386,7 @@
>  	dlm_recover_process_copy(ls, rc_in);
>  }
>  
> -static int send_ls_not_ready(struct dlm_ls *ls, int nodeid,
> -			     struct dlm_rcom *rc_in)
> +static int send_ls_not_ready(int nodeid, struct dlm_rcom *rc_in)
>  {
>  	struct dlm_rcom *rc;
>  	struct rcom_config *rf;
> @@ -395,7 +394,7 @@
>  	char *mb;
>  	int mb_len = sizeof(struct dlm_rcom) + sizeof(struct rcom_config);
>  
> -	mh = dlm_lowcomms_get_buffer(nodeid, mb_len, ls->ls_allocation, &mb);
> +	mh = dlm_lowcomms_get_buffer(nodeid, mb_len, GFP_NOFS, &mb);
>  	if (!mh)
>  		return -ENOBUFS;
>  	memset(mb, 0, mb_len);
> @@ -465,7 +464,7 @@
>  		log_print("lockspace %x from %d type %x not found",
>  			  hd->h_lockspace, nodeid, rc->rc_type);
>  		if (rc->rc_type == DLM_RCOM_STATUS)
> -			send_ls_not_ready(ls, nodeid, rc);
> +			send_ls_not_ready(nodeid, rc);
>  		return;
>  	}
>