From fb6c128503f0d80f33576e90ba8eff8f07d3af51 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Fri, 12 Jan 2018 11:03:35 -0800 Subject: [PATCH] scoutfs: move unblock_lock trace under lock It samples fields that are only consistent under the lock. We also want to see the fields every time it rechecks the conditions that stop it from downconverting. Signed-off-by: Zach Brown --- kmod/src/dlmglue.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/kmod/src/dlmglue.c b/kmod/src/dlmglue.c index 29e32112..d2724322 100644 --- a/kmod/src/dlmglue.c +++ b/kmod/src/dlmglue.c @@ -2398,11 +2398,12 @@ static int ocfs2_unblock_lock(struct ocfs2_super *osb, int set_lvb = 0; unsigned int gen; - trace_ocfs2_unblock_lock(osb, lockres); spin_lock_irqsave(&lockres->l_lock, flags); recheck: + trace_ocfs2_unblock_lock(osb, lockres); + /* * Is it still blocking? If not, we have no more work to do. */