diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-13 02:50:13 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-13 02:50:13 -0400 |
| commit | 54ef76f37bcccf8c16fbaaed13c3c40825195958 (patch) | |
| tree | 59afdb95e68f2fbac2550aa42135921086649c38 /fs/ocfs2/dlm/dlmmaster.c | |
| parent | 032f82786f9be4635acaa5f77feca175a4ac5fe1 (diff) | |
| parent | 9df2fe986770bc4c76e8fe72c20b71268eec39a7 (diff) | |
Merge branch 'linus' into sched/devel
Diffstat (limited to 'fs/ocfs2/dlm/dlmmaster.c')
| -rw-r--r-- | fs/ocfs2/dlm/dlmmaster.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/ocfs2/dlm/dlmmaster.c b/fs/ocfs2/dlm/dlmmaster.c index efc015c6128a..44f87caf3683 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, | |||
| 606 | 606 | ||
| 607 | res->last_used = 0; | 607 | res->last_used = 0; |
| 608 | 608 | ||
| 609 | spin_lock(&dlm->spinlock); | ||
| 609 | list_add_tail(&res->tracking, &dlm->tracking_list); | 610 | list_add_tail(&res->tracking, &dlm->tracking_list); |
| 611 | spin_unlock(&dlm->spinlock); | ||
| 610 | 612 | ||
| 611 | memset(res->lvb, 0, DLM_LVB_LEN); | 613 | memset(res->lvb, 0, DLM_LVB_LEN); |
| 612 | memset(res->refmap, 0, sizeof(res->refmap)); | 614 | memset(res->refmap, 0, sizeof(res->refmap)); |