From patchwork Fri Jan 20 14:27:04 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geliang Tang X-Patchwork-Id: 717749 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3v4jpm4LQlz9s3v for ; Sat, 21 Jan 2017 01:32:32 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Co4GeKIp"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752657AbdATO1i (ORCPT ); Fri, 20 Jan 2017 09:27:38 -0500 Received: from mail-pg0-f66.google.com ([74.125.83.66]:32999 "EHLO mail-pg0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752464AbdATO1M (ORCPT ); Fri, 20 Jan 2017 09:27:12 -0500 Received: by mail-pg0-f66.google.com with SMTP id 194so7075172pgd.0; Fri, 20 Jan 2017 06:27:12 -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; bh=xF/Jk/Dja9uQ+ewKHDuEPzSI3b6t/NWe2GJOV6kanzI=; b=Co4GeKIpTq15bslXFt1/bcC8UJnhVI7vWtUpyMDgKP+eL1A2mu7pyaIkTntkOb3+ut PHL0cjaVYjjpV4gu+OX4IJ2W1iN6KEwGbclVXPSWXsj9qMSHhWsIQHZJWvGgx1iNKzrX aCIsY+zeIEV1fePoLSIWXp+moWhE3XBNjaorC2sgi5HM/GRimzgkffissr+ig8AwYd/R nwFR4Uf35yG2f5/HRp6C1oe7/IStLj7aDSs33QnSEJDzcuU/E9L6spalcCx5xtaY3qgG Ppwn6+65c9ISKvuD4x+YXkBmuByyCMg62jIIxx1vKOyus/tTibsZKl90h3xzeEcAREyl 8Fyg== 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; bh=xF/Jk/Dja9uQ+ewKHDuEPzSI3b6t/NWe2GJOV6kanzI=; b=gDCbT98WvzDr3HOhX+2SGYKzpWKDoTj93vVV6o4Tje1nup0rJNK/+v7rZDsSE7/GuX fwfdg4ZVDJ5HgK8C+Q81gzCMS/pTsBcPzDH6Uy4gfqeE++/GHDJKro1aehHo8wAB7ps8 zLFxHjcslMWvigsTU/FgjWiN+NIdPOQPA/PjBSzgAlSlp/dBD3kg0+O2Ttr0m01H686J K/xZe5U33uDtW2dwgy+slFPLEISx9JvxOOedLsHjwnT4p/3sDQP0BSII287xcw9C3Uye 1GAw4NytQokVSWyxCl4ESG7U95HX+iR470qaDcIl3ObTKqgsjBlwfgidBg4evq/ImqwP 1xgA== X-Gm-Message-State: AIkVDXJTeakUoUw8RWnybzhdIcUnYej2zhxxNLDj4zKEp6Yq95gZHwKHZ5chPmZ9cwDFng== X-Received: by 10.99.150.10 with SMTP id c10mr17384794pge.121.1484922431792; Fri, 20 Jan 2017 06:27:11 -0800 (PST) Received: from localhost ([162.211.125.117]) by smtp.gmail.com with ESMTPSA id u14sm17421338pfg.18.2017.01.20.06.27.09 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 20 Jan 2017 06:27:11 -0800 (PST) From: Geliang Tang To: "David S. Miller" Cc: Geliang Tang , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] sock: use hlist_entry_safe Date: Fri, 20 Jan 2017 22:27:04 +0800 Message-Id: <697f2692562e48afa03304a7e605e8adbee8437e.1484829069.git.geliangtang@gmail.com> X-Mailer: git-send-email 2.9.3 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Use hlist_entry_safe() instead of open-coding it. Signed-off-by: Geliang Tang --- include/net/sock.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/include/net/sock.h b/include/net/sock.h index 4077ec4..c4e1caf1 100644 --- a/include/net/sock.h +++ b/include/net/sock.h @@ -544,8 +544,7 @@ static inline struct sock *sk_nulls_head(const struct hlist_nulls_head *head) static inline struct sock *sk_next(const struct sock *sk) { - return sk->sk_node.next ? - hlist_entry(sk->sk_node.next, struct sock, sk_node) : NULL; + return hlist_entry_safe(sk->sk_node.next, struct sock, sk_node); } static inline struct sock *sk_nulls_next(const struct sock *sk)