[MPTCP][PATCH mptcp-next] Squash to "mptcp: add tracepoint in mptcp_subflow_get_send"

[MPTCP][PATCH mptcp-next] Squash to "mptcp: add tracepoint in mptcp_subflow_get_send"

[Geliang Tang]

Reduce the indentation level and zero the uninitialized fields.

Suggested-by: Paolo Abeni <pabeni@redhat.com>
Signed-off-by: Geliang Tang <geliangtang@gmail.com>
---
 include/trace/events/mptcp.h | 32 +++++++++++++++++++-------------
 1 file changed, 19 insertions(+), 13 deletions(-)

diff --git a/include/trace/events/mptcp.h b/include/trace/events/mptcp.h
index d07ca1216442..41a27177d59b 100644
--- a/include/trace/events/mptcp.h
+++ b/include/trace/events/mptcp.h
@@ -31,22 +31,28 @@ TRACE_EVENT(mptcp_subflow_get_send,
 	),
 
 	TP_fast_assign(
-		bool sk = sk_fullsock(subflow->tcp_sock);
+		struct sock *ssk;
+		bool sk;
 
 		__entry->active = mptcp_subflow_active(subflow);
+		__entry->free = 0;
+		__entry->snd_wnd = 0;
+		__entry->pace = 0;
 		__entry->backup = subflow->backup;
-		if (sk) {
-			struct sock *ssk = mptcp_subflow_tcp_sock(subflow);
-
-			__entry->free = sk_stream_memory_free(subflow->tcp_sock);
-			if (ssk) {
-				__entry->snd_wnd = tcp_sk(ssk)->snd_wnd;
-				__entry->pace = ssk->sk_pacing_rate;
-				if (__entry->pace)
-					__entry->ratio = div_u64((u64)ssk->sk_wmem_queued << 32,
-								 __entry->pace);
-			}
-		}
+		__entry->ratio = 0;
+
+		sk = sk_fullsock(subflow->tcp_sock);
+		if (!sk)
+			return;
+		__entry->free = sk_stream_memory_free(subflow->tcp_sock);
+		ssk = mptcp_subflow_tcp_sock(subflow);
+		if (!ssk)
+			return;
+		__entry->snd_wnd = tcp_sk(ssk)->snd_wnd;
+		__entry->pace = ssk->sk_pacing_rate;
+		if (!__entry->pace)
+			return;
+		__entry->ratio = div_u64((u64)ssk->sk_wmem_queued << 32, __entry->pace);
 	),
 
 	TP_printk("active=%d free=%d snd_wnd=%u pace=%u backup=%u ratio=%llu",
-- 
2.30.2