Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2af37ce8 authored by Tao Ma's avatar Tao Ma Committed by Mark Fasheh
Browse files

ocfs2: Use dlm_print_one_lock_resource for lock resource print 



__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: default avatarTao Ma <tao.ma@oracle.com>
Signed-off-by: default avatarMark Fasheh <mark.fasheh@oracle.com>
parent 3a4780a8

fs/ocfs2/dlm/dlmconvert.c

+1 −1
Original line number Diff line number Diff line
@@ -487,7 +487,7 @@ int dlm_convert_lock_handler(struct o2net_msg *msg, u32 len, void *data, 
			       "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
Original line number Diff line number Diff line
@@ -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 "

		     	"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(struct dlm_work_item *item, void *data) 
		mlog(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
Original line number Diff line number Diff line
@@ -1191,7 +1191,7 @@ static int dlm_add_lock_to_array(struct dlm_lock *lock, 
			    (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);