From: Alexander Aring <aahringo@redhat.com>
Date: Wed, 22 Jun 2022 18:45:10 +0000 (-0400)
Subject: fs: dlm: change ast and bast trace order
X-Git-Tag: v6.0-rc1~221^2~13
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cd1e8ca9f3a4c7e3e1f22341a71e013797b3a0f0;p=thirdparty%2Fkernel%2Flinux.git

fs: dlm: change ast and bast trace order

This patch moves the trace calls for ast and bast to before the
ast and bast callback functions are called rather than after.

Signed-off-by: Alexander Aring <aahringo@redhat.com>
Signed-off-by: David Teigland <teigland@redhat.com>
---

diff --git a/fs/dlm/ast.c b/fs/dlm/ast.c
index bfac462dd3e8f..df25c3e785cf6 100644
--- a/fs/dlm/ast.c
+++ b/fs/dlm/ast.c
@@ -255,13 +255,13 @@ void dlm_callback_work(struct work_struct *work)
 		if (callbacks[i].flags & DLM_CB_SKIP) {
 			continue;
 		} else if (callbacks[i].flags & DLM_CB_BAST) {
-			bastfn(lkb->lkb_astparam, callbacks[i].mode);
 			trace_dlm_bast(ls, lkb, callbacks[i].mode);
+			bastfn(lkb->lkb_astparam, callbacks[i].mode);
 		} else if (callbacks[i].flags & DLM_CB_CAST) {
 			lkb->lkb_lksb->sb_status = callbacks[i].sb_status;
 			lkb->lkb_lksb->sb_flags = callbacks[i].sb_flags;
-			castfn(lkb->lkb_astparam);
 			trace_dlm_ast(ls, lkb, lkb->lkb_lksb);
+			castfn(lkb->lkb_astparam);
 		}
 	}