From: Sunil Mushran Date: Mon, 7 Jul 2008 17:06:29 +0000 (-0700) Subject: [PATCH] ocfs2/dlm: Fixes oops in dlm_new_lockres() X-Git-Tag: v2.6.26~38^2 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=18c6ac383f3e46cfce08d0bf972705852a4e1268;p=linux-2.6-omap-h63xx.git [PATCH] ocfs2/dlm: Fixes oops in dlm_new_lockres() Patch fixes a race that can result in an oops while adding a lockres to the dlm lockres tracking list. Bug introduced by mainline commit 29576f8bb54045be944ba809d4fca1ad77c94165. Signed-off-by: Sunil Mushran Signed-off-by: Mark Fasheh --- diff --git a/fs/ocfs2/dlm/dlmmaster.c b/fs/ocfs2/dlm/dlmmaster.c index efc015c6128..44f87caf368 100644 --- a/fs/ocfs2/dlm/dlmmaster.c +++ b/fs/ocfs2/dlm/dlmmaster.c @@ -606,7 +606,9 @@ static void dlm_init_lockres(struct dlm_ctxt *dlm, res->last_used = 0; + spin_lock(&dlm->spinlock); list_add_tail(&res->tracking, &dlm->tracking_list); + spin_unlock(&dlm->spinlock); memset(res->lvb, 0, DLM_LVB_LEN); memset(res->refmap, 0, sizeof(res->refmap));