From patchwork Fri Oct 9 10:57:00 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Davide Caratti X-Patchwork-Id: 1379112 X-Patchwork-Delegate: matthieu.baerts@tessares.net Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.01.org (client-ip=198.145.21.10; helo=ml01.01.org; envelope-from=mptcp-bounces@lists.01.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=A7uDHXqV; dkim-atps=neutral Received: from ml01.01.org (ml01.01.org [198.145.21.10]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4C74lg3LFYz9sTc for ; Fri, 9 Oct 2020 21:57:18 +1100 (AEDT) Received: from ml01.vlan13.01.org (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id B12CB15967E0B; Fri, 9 Oct 2020 03:57:14 -0700 (PDT) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=63.128.21.124; helo=us-smtp-delivery-124.mimecast.com; envelope-from=dcaratti@redhat.com; receiver= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id CD6D115967E09 for ; Fri, 9 Oct 2020 03:57:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1602241030; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JTKWRD7GagPb4oL3cFNKytXSIEqmfuC21xATnb8anp8=; b=A7uDHXqVxtG2klY/bbXQwPEpfVDav1KQC5miEBGNOcdCpc61ie7fzWxbk/8WBJYO+Yge8v LWp/Kdlw3NlwcFPxlwys5OlF5RuopTM3cZyCgJtwU1fWifpuhB5HMwZWqoVWg27tfIOdjt +KN9lUbtrjS5B1Ujb8VMlDLQKLC5bKI= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-574-ILERu5kHPra2j1MBXq6AKQ-1; Fri, 09 Oct 2020 06:57:09 -0400 X-MC-Unique: ILERu5kHPra2j1MBXq6AKQ-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 07C201009441 for ; Fri, 9 Oct 2020 10:57:08 +0000 (UTC) Received: from new-host-6.redhat.com (unknown [10.40.192.88]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6F1EE60E1C for ; Fri, 9 Oct 2020 10:57:07 +0000 (UTC) From: Davide Caratti To: mptcp@lists.01.org Date: Fri, 9 Oct 2020 12:57:00 +0200 Message-Id: <24df6b98e251b2d67c25f12eb3c6c974aafa0101.1602241020.git.dcaratti@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=dcaratti@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Message-ID-Hash: LZVVSZZF4M2L3AZB645WO73AWPGU7543 X-Message-ID-Hash: LZVVSZZF4M2L3AZB645WO73AWPGU7543 X-MailFrom: dcaratti@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.1.1 Precedence: list Subject: [MPTCP] [PATCH net-next] Squash-to: mptcp: refactor shutdown and close List-Id: Discussions regarding MPTCP upstreaming Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: the format specifier for 'write_seq' in __mptcp_check_send_data_fin() should be the same as the one used for 'snd_nxt', to prevent humans from becoming suddenly sad while inspecting the output of pr_debug(). Change both 'snd_nxt' and 'write_seq' to be %llu. Signed-off-by: Davide Caratti --- net/mptcp/protocol.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index f8812097d63d..736a6481d20f 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -2033,7 +2033,7 @@ static void __mptcp_check_send_data_fin(struct sock *sk) struct mptcp_subflow_context *subflow; struct mptcp_sock *msk = mptcp_sk(sk); - pr_debug("msk=%p snd_data_fin_enable=%d pending=%d snd_nxt=%lld write_seq=%llx", + pr_debug("msk=%p snd_data_fin_enable=%d pending=%d snd_nxt=%llu write_seq=%llu", msk, msk->snd_data_fin_enable, !!mptcp_send_head(sk), msk->snd_nxt, msk->write_seq);