[Cluster-devel] cluster/gfs-kernel/src/dlm thread.c

[teigland at sourceware.org]

CVSROOT:	/cvs/cluster
Module name:	cluster
Branch: 	RHEL4
Changes by:	teigland at sourceware.org	2007-08-31 15:23:33

Modified files:
	gfs-kernel/src/dlm: thread.c 

Log message:
	Check for a null lvb pointer before trying to memset the lvb to zero.
	I think there's a good chance this will fix bz 176838.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs-kernel/src/dlm/thread.c.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.16.2.5&r2=1.16.2.6

--- cluster/gfs-kernel/src/dlm/Attic/thread.c	2006/12/08 17:31:31	1.16.2.5
+++ cluster/gfs-kernel/src/dlm/Attic/thread.c	2007/08/31 15:23:32	1.16.2.6
@@ -116,8 +116,13 @@
 		goto out;
 	}
 
-	if (lp->lksb.sb_flags & DLM_SBF_VALNOTVALID)
-		memset(lp->lksb.sb_lvbptr, 0, DLM_LVB_LEN);
+	if (lp->lksb.sb_flags & DLM_SBF_VALNOTVALID) {
+		if (lp->lksb.sb_lvbptr)
+			memset(lp->lksb.sb_lvbptr, 0, DLM_LVB_LEN);
+		else
+			log_all("no lvb for VALNOTVALID lkid %x",
+				lp->lksb.sb_lkid);
+	}
 
 	if (lp->lksb.sb_flags & DLM_SBF_ALTMODE) {
 		if (lp->req == DLM_LOCK_PR)