summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-07-08 21:48:26 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-07-08 21:48:26 -0700
commitb72e9ebe7efa5754aa53bbdb0040a2d6eeb34db3 (patch)
treeac9ae8efb9109a17e3633409aaa245100f97c425 /fs
parentba0fc709e197415aadd46b9ec208dc4abaa21edd (diff)
parent18c6ac383f3e46cfce08d0bf972705852a4e1268 (diff)
downloadop-kernel-dev-b72e9ebe7efa5754aa53bbdb0040a2d6eeb34db3.zip
op-kernel-dev-b72e9ebe7efa5754aa53bbdb0040a2d6eeb34db3.tar.gz
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2: [PATCH] ocfs2/dlm: Fixes oops in dlm_new_lockres()
Diffstat (limited to 'fs')
-rw-r--r--fs/ocfs2/dlm/dlmmaster.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/ocfs2/dlm/dlmmaster.c b/fs/ocfs2/dlm/dlmmaster.c
index efc015c..44f87ca 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));
OpenPOWER on IntegriCloud