]> err.no Git - linux-2.6/commitdiff
[PATCH] ocfs2/dlm: Fixes oops in dlm_new_lockres()
authorSunil Mushran <sunil.mushran@oracle.com>
Mon, 7 Jul 2008 17:06:29 +0000 (10:06 -0700)
committerMark Fasheh <mfasheh@suse.com>
Mon, 7 Jul 2008 18:24:29 +0000 (11:24 -0700)
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 <sunil.mushran@oracle.com>
Signed-off-by: Mark Fasheh <mfasheh@suse.com>
fs/ocfs2/dlm/dlmmaster.c

index efc015c6128aecc9aae54772dbf71c9a88b39211..44f87caf36834fda999768a06448953afcaa6ef4 100644 (file)
@@ -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));