From patchwork Thu May 17 21:47:24 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Dumazet X-Patchwork-Id: 915823 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.b="g48Alq6r"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40n4fN3dHWz9s1w for ; Fri, 18 May 2018 07:47:40 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751977AbeEQVri (ORCPT ); Thu, 17 May 2018 17:47:38 -0400 Received: from mail-pf0-f194.google.com ([209.85.192.194]:39960 "EHLO mail-pf0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751698AbeEQVrg (ORCPT ); Thu, 17 May 2018 17:47:36 -0400 Received: by mail-pf0-f194.google.com with SMTP id f189-v6so2715910pfa.7 for ; Thu, 17 May 2018 14:47:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=a0SDOKRDG/baXCFSddlGoFiZ9zXormCr6VVxI2xZ/E0=; b=g48Alq6rbS5qMqRFWKmpJzefuZijWPYABetgIdJx+24gNiByniqdZ4L+sXiPgVus8c JDm3yUna0B/fu2auan8EWZjMQiZ5I9t7XFdLHu6T0Wa7Ua2eI37ZbYUC/ToLLtbYK/SR 9wcEhasXCnQpU3DTFEacLFn779Bg4cClJS+J0uRjC5pNhHfIJ+MMcTGQf612OjCv0ROD Z9kZXE2ORciDMDCUYoCovvoqqXVjmZ4x4pYhrtqNiKYTjeXOMQ2CpfmVpg2qfK2Fl307 05EfI2v1h01QFbNhLNzu637pUrA2FCpwoPiLlmInRcizEu6jjkYvjptM2kXYQrWQAWKB SNPA== 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:in-reply-to :references; bh=a0SDOKRDG/baXCFSddlGoFiZ9zXormCr6VVxI2xZ/E0=; b=Wii5s7Yk9iTiRLZtugy73ZLBzlMZtf/wx+mXfv3d8HPzmOyx72lrMdPadW1ZQjdq3Z JJ6dLSgNoCo1IMLSEtmTyT4x1ZFmWfqomhsthUCJfEJMH8LEBga91AkqoBJtTGuJwxf7 ZmiaqBVHzY9PYz0LXqlWCEs+jtc9UYj+PUN0sMcF1TaA8vMgE0TcuXXJUXU4oX6exsuD 2hIAVGSXACtLv5VkpnF+Isa9/GKwxmzSbEIxQdtME8FxT+0IrNC+AuCTootuib/pna2w gWMFQTaBMldEE6VvtJ/WNq7mn86LFUF5mIWnThN6CIuFk2NKg0gKUgDKHyOBGFB8y+n1 H/Qg== X-Gm-Message-State: ALKqPwehChC+ZxEvJVQEfdUca9VoY692UBIS3K0EgguJAGLaS9xpZccn 1HnecGDNuycWFeIkqh4mTVbu32g0vUE= X-Google-Smtp-Source: AB8JxZrZFhUttqO0+qaIKFp/iNS9vMe4QXVbB9DFzJMLYtSQT/FOZc9gsvww26oKDTYZw7Prt7dQ5Q== X-Received: by 2002:a62:4387:: with SMTP id l7-v6mr6588533pfi.55.1526593655131; Thu, 17 May 2018 14:47:35 -0700 (PDT) Received: from localhost ([2620:15c:2c4:201:f5a:7eca:440a:3ead]) by smtp.gmail.com with ESMTPSA id x71-v6sm16356641pfe.47.2018.05.17.14.47.33 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 17 May 2018 14:47:34 -0700 (PDT) From: Eric Dumazet To: "David S . Miller" Cc: netdev , =?utf-8?q?Toke_H=C3=B8iland-J=C3=B8rg?= =?utf-8?q?ensen?= , Neal Cardwell , Yuchung Cheng , Soheil Hassas Yeganeh , Eric Dumazet , Eric Dumazet Subject: [PATCH v3 net-next 1/6] tcp: use __sock_put() instead of sock_put() in tcp_clear_xmit_timers() Date: Thu, 17 May 2018 14:47:24 -0700 Message-Id: <20180517214729.186094-2-edumazet@google.com> X-Mailer: git-send-email 2.17.0.441.gb46fe60e1d-goog In-Reply-To: <20180517214729.186094-1-edumazet@google.com> References: <20180517214729.186094-1-edumazet@google.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Socket can not disappear under us. Signed-off-by: Eric Dumazet Acked-by: Neal Cardwell --- include/net/tcp.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/net/tcp.h b/include/net/tcp.h index 6deb540297ccaa1f05ce633efe313d1ca2c15dd9..511bd0fde1dc1dd842598d083905b0425bcb05f8 100644 --- a/include/net/tcp.h +++ b/include/net/tcp.h @@ -559,7 +559,7 @@ void tcp_init_xmit_timers(struct sock *); static inline void tcp_clear_xmit_timers(struct sock *sk) { if (hrtimer_try_to_cancel(&tcp_sk(sk)->pacing_timer) == 1) - sock_put(sk); + __sock_put(sk); inet_csk_clear_xmit_timers(sk); }