From patchwork Mon Nov 23 03:13:40 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geliang Tang X-Patchwork-Id: 1404614 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=2001:19d0:306:5::1; helo=ml01.01.org; envelope-from=mptcp-bounces@lists.01.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=sdwNxyv7; dkim-atps=neutral Received: from ml01.01.org (ml01.01.org [IPv6:2001:19d0:306:5::1]) (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 4CfXLG0VTbz9s0b for ; Mon, 23 Nov 2020 14:13:57 +1100 (AEDT) Received: from ml01.vlan13.01.org (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 09DBE100ED4BD; Sun, 22 Nov 2020 19:13:47 -0800 (PST) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=2607:f8b0:4864:20::644; helo=mail-pl1-x644.google.com; envelope-from=geliangtang@gmail.com; receiver= Received: from mail-pl1-x644.google.com (mail-pl1-x644.google.com [IPv6:2607:f8b0:4864:20::644]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 8928D100ED4B7 for ; Sun, 22 Nov 2020 19:13:45 -0800 (PST) Received: by mail-pl1-x644.google.com with SMTP id t18so8171321plo.0 for ; Sun, 22 Nov 2020 19:13:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=95i+GWRB83CtR+mK6Nky0wMAFO+lHE8fOCAvz1/drZ8=; b=sdwNxyv7GqgAXebKcvO8RPAxXT/prm50LjPeQ6Y/Vuc0tKsriLlNcPR18bLEqT6UOA Ew53rlsbLs7IcYNydjD36as4ULneXshN5GqWGRYdql6vpQoHMjUJ7E02Ht7mVqdaYaEm BIr6qY4yzaB3Q2Uo76MRd1dkuAoPfRk5rPpzrRr0HV5NWVLDjA7PZYK6YfqqdYDOhnZ8 SYeATgg9XtcIcF0p71D4jpLlGzsGdr6y+6bBDDFcwV8gndAu0ZmExVO/QH0Mmpw4w0Nk aZMfWI1Ow9g3jsfjcBYXymL4EvxS42ZZSoLqElcofqQISOlDOKtNfZyyap1Ozjk7V5Br V0jg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=95i+GWRB83CtR+mK6Nky0wMAFO+lHE8fOCAvz1/drZ8=; b=SydOujCW9tU0BVWvKbHI4b0muxRoWnQ3dy6AG57tNlx0r3k8fG+l9/D7wCYl852zOZ mYNUnZjESSeXL5V4nEpMcSEz/welKL8J2AxHSuFe5//3Fn+7m/pgH1wMmIx3ALvtPSaU r14jpXP//EBtodtsDOBXIhPeP/JEN0Krh1wuwBn5CYAacAtTzsZRcNa1CYiL1M1wYhka J7Y+LOf86MusSXQjpUIX1A4cpyWSUmru8jUrjNR9bd9kH7f6J1EAv6aYtXMwwtR2LYKr PaKNSJld+PozGro9MqCJgTIzFjHR4ywcrnk9uRGMd2xPy7DFycteP12yh9PaY9nfzGrR Kusg== X-Gm-Message-State: AOAM533yJEB9SIPfTbhGBWnSMavJr4bDkIyXPh8YXMN2HjBPa+TIvwIL dKZuH+8puyb0dqBBYcaxefg6FAkVAbmPDA== X-Google-Smtp-Source: ABdhPJwrAyM8hLpd8VtUNSSsRqk8CJ3S5XEseDI2SIg1bUl8cVQnnHxFQYBWWoy4/89n2LC5m8fb6Q== X-Received: by 2002:a17:902:8f81:b029:d9:e545:8350 with SMTP id z1-20020a1709028f81b02900d9e5458350mr13039440plo.14.1606101224464; Sun, 22 Nov 2020 19:13:44 -0800 (PST) Received: from localhost ([2400:8800:300:11c:8e6c:4e4f:63c1:12db]) by smtp.gmail.com with ESMTPSA id k26sm10049950pfg.8.2020.11.22.19.13.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 22 Nov 2020 19:13:43 -0800 (PST) From: Geliang Tang To: mptcp@lists.01.org Date: Mon, 23 Nov 2020 11:13:40 +0800 Message-Id: X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Message-ID-Hash: VBBZZT4B4CF3FPI4QUCCUP7GKLSNNFU6 X-Message-ID-Hash: VBBZZT4B4CF3FPI4QUCCUP7GKLSNNFU6 X-MailFrom: geliangtang@gmail.com X-Mailman-Rule-Hits: member-moderation X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address CC: Geliang Tang X-Mailman-Version: 3.1.1 Precedence: list Subject: [MPTCP] [MPTCP][PATCH mptcp-next] Squash to "mptcp: protect the rx path with the msk socket spinlock": a small cleanup List-Id: Discussions regarding MPTCP upstreaming Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: Since the local variable sk is defined, use it instead of open-coding. Signed-off-by: Geliang Tang --- 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 e4bb41c02cc4..4a6e485dd22a 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -1869,7 +1869,7 @@ static bool __mptcp_move_skbs(struct mptcp_sock *msk, unsigned int rcv) mptcp_data_unlock(sk); } if (ret) - mptcp_check_data_fin((struct sock *)msk); + mptcp_check_data_fin(sk); return !skb_queue_empty(&msk->receive_queue); }