Use dlm_print_one_lock_resource for lock reason.
PATCH 1/1 Use dlm_print_one_lock_resource for lock reason.
__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.
---
fs/ocfs2/dlm/dlmconvert.c | 2 +- fs/ocfs2/dlm/dlmmaster.c | 4 ++-- fs/ocfs2/dlm/dlmrecovery.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-)
e24386850ba5540d084e1aa0b7934116ff587165
fs/ocfs2/dlm/dlmconvert.c +1 -1
@@ -487,7 +487,7 @@ int dlm_convert_lock_handler(struct o2ne"cookie=%u:%llu\n" ,dlm_get_lock_cookie_node (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; }
fs/ocfs2/dlm/dlmmaster.c +2 -2
@@ -2348,7 +2348,7 @@ int dlm_deref_lockres_handler(struct o2nmlog (ML_ERROR ,"%s:%.*s: node %u trying to drop ref " "but it is already dropped!\n" , dlm->name, res->lockname.len, res->lockname.name, node); -__dlm_print_one_lock_resource (res); +dlm_print_one_lock_resource (res); } ret =0 ; goto done;
@@ -2408,7 +2408,7 @@ static void dlm_deref_lockres_worker(strmlog (ML_ERROR ,"%s:%.*s: node %u trying to drop ref " "but it is already dropped!\n" , dlm->name, res->lockname.len, res->lockname.name, node); -__dlm_print_one_lock_resource (res); +dlm_print_one_lock_resource (res); }dlm_lockres_put (res);
fs/ocfs2/dlm/dlmrecovery.c +1 -1
@@ -1191,7 +1191,7 @@ static int dlm_add_lock_to_array(struct (ml->type == LKM_EXMODE || memcmp(mres->lvb, lock->lksb->lvb, DLM_LVB_LEN))) {mlog (ML_ERROR ,"mismatched lvbs!\n" ); -__dlm_print_one_lock_resource (lock->lockres); +dlm_print_one_lock_resource (lock->lockres);BUG (); }memcpy (mres->lvb, lock->lksb->lvb,DLM_LVB_LEN );
Signature · 1 line
1.3.3
PATCH 1/1 Use dlm_print_one_lock_resource for lock reason.
Actually this is already in the last set of dlm patches. The one I missed was dlm_lock_add_to_array().
http://oss.oracle.com/pipermail/ocfs2-devel/2008-February/001847.html
Make a patch just for that and we can add that in the checkin queue.
Quoted 64 lines · Tao Ma
__dlm_print_one_lock_resourcemust be called withspin_locktheres->spinlock. While in some cases, we use it without this precondition and lead to the failure ofassert_spin_locked. So calldlm_print_one_lock_resourceinstead.Signed-off-by Tao Ma <[email protected]>---
fs/ocfs2/dlm/dlmconvert.c | 2 +- fs/ocfs2/dlm/dlmmaster.c | 4 ++-- fs/ocfs2/dlm/dlmrecovery.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-)
e24386850ba5540d084e1aa0b7934116ff587165fs/ocfs2/dlm/dlmconvert.c +1
-1@@ -487,7 +487,7 @@ int dlm_convert_lock_handler(struct o2ne"cookie=%u:%llu\n" ,dlm_get_lock_cookie_node (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; }fs/ocfs2/dlm/dlmmaster.c +2
-2@@ -2348,7 +2348,7 @@ int dlm_deref_lockres_handler(struct o2nmlog (ML_ERROR ,"%s:%.*s: node %u trying to drop ref " "but it is already dropped!\n" , dlm->name, res->lockname.len, res->lockname.name, node); -__dlm_print_one_lock_resource (res); +dlm_print_one_lock_resource (res); } ret =0 ; goto done;@@ -2408,7 +2408,7 @@ static void dlm_deref_lockres_worker(strmlog (ML_ERROR ,"%s:%.*s: node %u trying to drop ref " "but it is already dropped!\n" , dlm->name, res->lockname.len, res->lockname.name, node); -__dlm_print_one_lock_resource (res); +dlm_print_one_lock_resource (res); }dlm_lockres_put (res);fs/ocfs2/dlm/dlmrecovery.c +1
-1@@ -1191,7 +1191,7 @@ static int dlm_add_lock_to_array(struct (ml->type == LKM_EXMODE || memcmp(mres->lvb, lock->lksb->lvb, DLM_LVB_LEN))) {mlog (ML_ERROR ,"mismatched lvbs!\n" ); -__dlm_print_one_lock_resource (lock->lockres); +dlm_print_one_lock_resource (lock->lockres);BUG (); }memcpy (mres->lvb, lock->lksb->lvb,DLM_LVB_LEN );