Piteball/android_kernel_google_msm
1
0
Fork 0
mirror of https://github.com/followmsi/android_kernel_google_msm.git synced 2024-11-06 23:17:41 +00:00
Code Issues Projects Releases Wiki Activity

ocfs2: Use dlm_print_one_lock_resource for lock resource print

Browse source 
__dlm_print_one_lock_resource must be called with spin_lock
the res->spinlock. While in some cases, we use it without this
precondition and lead to the failure of assert_spin_locked.
So call dlm_print_one_lock_resource instead.

Signed-off-by: Tao Ma <tao.ma@oracle.com>
Signed-off-by: Mark Fasheh <mark.fasheh@oracle.com>
This commit is contained in:
Tao Ma 2008-02-28 10:41:55 +08:00 committed by Mark Fasheh
parent 3a4780a85d
commit 2af37ce82d
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
fs/ocfs2/dlm/dlmconvert.c
View file

@ -487,7 +487,7 @@ int dlm_convert_lock_handler(struct o2net_msg *msg, u32 len, void *data,
"cookie=%u:%llu\n", "cookie=%u:%llu\n",
dlm_get_lock_cookie_node(be64_to_cpu(cnv->cookie)), dlm_get_lock_cookie_node(be64_to_cpu(cnv->cookie)),
dlm_get_lock_cookie_seq(be64_to_cpu(cnv->cookie))); dlm_get_lock_cookie_seq(be64_to_cpu(cnv->cookie)));
__dlm_print_one_lock_resource(res); dlm_print_one_lock_resource(res);
goto leave; goto leave;
} }

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

@ -2348,7 +2348,7 @@ int dlm_deref_lockres_handler(struct o2net_msg *msg, u32 len, void *data,
mlog(ML_ERROR, "%s:%.*s: node %u trying to drop ref " mlog(ML_ERROR, "%s:%.*s: node %u trying to drop ref "
"but it is already dropped!\n", dlm->name, "but it is already dropped!\n", dlm->name,
res->lockname.len, res->lockname.name, node); res->lockname.len, res->lockname.name, node);
__dlm_print_one_lock_resource(res); dlm_print_one_lock_resource(res);
} }
ret = 0; ret = 0;
goto done; goto done;
@ -2408,7 +2408,7 @@ static void dlm_deref_lockres_worker(struct dlm_work_item *item, void *data)
mlog(ML_ERROR, "%s:%.*s: node %u trying to drop ref " mlog(ML_ERROR, "%s:%.*s: node %u trying to drop ref "
"but it is already dropped!\n", dlm->name, "but it is already dropped!\n", dlm->name,
res->lockname.len, res->lockname.name, node); res->lockname.len, res->lockname.name, node);
__dlm_print_one_lock_resource(res); dlm_print_one_lock_resource(res);
} }
dlm_lockres_put(res); dlm_lockres_put(res);

2
fs/ocfs2/dlm/dlmrecovery.c
View file

@ -1191,7 +1191,7 @@ static int dlm_add_lock_to_array(struct dlm_lock *lock,
(ml->type == LKM_EXMODE || (ml->type == LKM_EXMODE ||
memcmp(mres->lvb, lock->lksb->lvb, DLM_LVB_LEN))) { memcmp(mres->lvb, lock->lksb->lvb, DLM_LVB_LEN))) {
mlog(ML_ERROR, "mismatched lvbs!\n"); mlog(ML_ERROR, "mismatched lvbs!\n");
__dlm_print_one_lock_resource(lock->lockres); dlm_print_one_lock_resource(lock->lockres);
BUG(); BUG();
} }
memcpy(mres->lvb, lock->lksb->lvb, DLM_LVB_LEN); memcpy(mres->lvb, lock->lksb->lvb, DLM_LVB_LEN);