Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2 (b72e9ebe) · Commits · 戴 / test

fs/ocfs2/dlm/dlmmaster.c

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -606,7 +606,9 @@ static void dlm_init_lockres(struct dlm_ctxt *dlm,

	res->last_used = 0;		res->last_used = 0;

			spin_lock(&dlm->spinlock);
	list_add_tail(&res->tracking, &dlm->tracking_list);		list_add_tail(&res->tracking, &dlm->tracking_list);
			spin_unlock(&dlm->spinlock);

	memset(res->lvb, 0, DLM_LVB_LEN);		memset(res->lvb, 0, DLM_LVB_LEN);
	memset(res->refmap, 0, sizeof(res->refmap));		memset(res->refmap, 0, sizeof(res->refmap));