Commit 0c4c516f authored by Alexander Aring's avatar Alexander Aring Committed by David Teigland
Browse files

fs: dlm: remove additional dereference of lksb 



This patch removes a dereference of lksb of lkb when calling ast
tracepoint. First it reduces additional overhead, even if traces
are not active. Second we can deference it in TP_fast_assign from
the existing lkb parameter.

Signed-off-by: default avatarAlexander Aring <aahringo@redhat.com>
Signed-off-by: default avatarDavid Teigland <teigland@redhat.com>
parent cd1e8ca9

fs/dlm/ast.c

+1 −1
Original line number Diff line number Diff line
@@ -260,7 +260,7 @@ void dlm_callback_work(struct work_struct *work) 
		} 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;

			trace_dlm_ast(ls, lkb, lkb->lkb_lksb);

			trace_dlm_ast(ls, lkb);

			castfn(lkb->lkb_astparam);

		}

	}

include/trace/events/dlm.h

+4 −4
Original line number Diff line number Diff line
@@ -138,9 +138,9 @@ TRACE_EVENT(dlm_bast, 


TRACE_EVENT(dlm_ast,



	TP_PROTO(struct dlm_ls *ls, struct dlm_lkb *lkb, struct dlm_lksb *lksb),

	TP_PROTO(struct dlm_ls *ls, struct dlm_lkb *lkb),



	TP_ARGS(ls, lkb, lksb),

	TP_ARGS(ls, lkb),



	TP_STRUCT__entry(

		__field(__u32, ls_id)
@@ -152,8 +152,8 @@ TRACE_EVENT(dlm_ast, 
	TP_fast_assign(

		__entry->ls_id = ls->ls_global_id;

		__entry->lkb_id = lkb->lkb_id;

		__entry->sb_flags = lksb->sb_flags;

		__entry->sb_status = lksb->sb_status;

		__entry->sb_flags = lkb->lkb_lksb->sb_flags;

		__entry->sb_status = lkb->lkb_lksb->sb_status;

	),



	TP_printk("ls_id=%u lkb_id=%x sb_flags=%s sb_status=%d",