evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ocfs2_dlm: Add missing locks in dlm_empty_lockres

Browse source 
__dlm_lockres_unused() expects the caller to take the lockres spinlock.

Signed-off-by: Sunil Mushran <sunil.mushran@oracle.com>
Signed-off-by: Mark Fasheh <mark.fasheh@oracle.com>
This commit is contained in:
Sunil Mushran 2007-03-12 13:25:44 -07:00 • committed by Mark Fasheh
parent 3fca0894a4
commit b36c3f8498
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
fs/ocfs2/dlm/dlmmaster.c
View file

@ -2730,14 +2730,17 @@ int dlm_empty_lockres(struct dlm_ctxt *dlm, struct dlm_lock_resource *res)
int ret; int ret;
int lock_dropped = 0; int lock_dropped = 0;
spin_lock(&res->spinlock);
if (res->owner != dlm->node_num) { if (res->owner != dlm->node_num) {
if (!__dlm_lockres_unused(res)) { if (!__dlm_lockres_unused(res)) {
mlog(ML_ERROR, "%s:%.*s: this node is not master, " mlog(ML_ERROR, "%s:%.*s: this node is not master, "
"trying to free this but locks remain\n", "trying to free this but locks remain\n",
dlm->name, res->lockname.len, res->lockname.name); dlm->name, res->lockname.len, res->lockname.name);
} }
spin_unlock(&res->spinlock);
goto leave; goto leave;
} }
spin_unlock(&res->spinlock);
/* Wheee! Migrate lockres here! Will sleep so drop spinlock. */ /* Wheee! Migrate lockres here! Will sleep so drop spinlock. */
spin_unlock(&dlm->spinlock); spin_unlock(&dlm->spinlock);