From patchwork Thu Dec 10 14:17:17 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geliang Tang X-Patchwork-Id: 7819141 X-Patchwork-Delegate: axboe@kernel.dk Return-Path: X-Original-To: patchwork-linux-block@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 4F8539F39B for ; Thu, 10 Dec 2015 14:20:25 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D70B7202A1 for ; Thu, 10 Dec 2015 14:20:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 295BC2024C for ; Thu, 10 Dec 2015 14:20:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752916AbbLJOTv (ORCPT ); Thu, 10 Dec 2015 09:19:51 -0500 Received: from m50-133.163.com ([123.125.50.133]:34674 "EHLO m50-133.163.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752380AbbLJOTs (ORCPT ); Thu, 10 Dec 2015 09:19:48 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id; bh=A2nDKVNdCpNmfmHRIC y92Zweh0p51IjvCEEm8XCAdgw=; b=WOKisZ+rPlHED/Wcf9u1cwlcCrD3rFWEtC Fp0KzrGRxAFpSmTQduN2smPdzJDSTE8vcZHFJD8ajmfKRZOmvwe+CNhxnnx833Vc OVCvxXjuaAjxiwklWaa2wRMBjla9dxGnHb7dfhLolxZNaFVp08qfeZ2wkZSyEkuE QIIcMdzr4= Received: from localhost (unknown [116.77.128.176]) by smtp3 (Coremail) with SMTP id DdGowEDZKkZ4iWlWaeUAAA--.352S3; Thu, 10 Dec 2015 22:17:28 +0800 (CST) From: Geliang Tang To: Pablo Neira Ayuso , Patrick McHardy , Jozsef Kadlecsik , "David S. Miller" Cc: Geliang Tang , Jens Axboe , "Paul E. McKenney" , Jan Kara , Josef Bacik , Josh Triplett , Josh Poimboeuf , Seth Jennings , Jiri Kosina , Vojtech Pavlik , live-patching@vger.kernel.org, netfilter-devel@vger.kernel.org, coreteam@netfilter.org, netdev@vger.kernel.org, linux-block@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 3/4] netfilter: ipset: use list_is_first() Date: Thu, 10 Dec 2015 22:17:17 +0800 Message-Id: X-Mailer: git-send-email 2.5.0 In-Reply-To: <305feb971ae11e192f35f25d66bb7b2e28e06c39.1449755818.git.geliangtang@163.com> References: <305feb971ae11e192f35f25d66bb7b2e28e06c39.1449755818.git.geliangtang@163.com> In-Reply-To: <394e9e5ece944969fe1ff4f37c9a73bf5543265e.1449755818.git.geliangtang@163.com> References: <305feb971ae11e192f35f25d66bb7b2e28e06c39.1449755818.git.geliangtang@163.com> <394e9e5ece944969fe1ff4f37c9a73bf5543265e.1449755818.git.geliangtang@163.com> X-CM-TRANSID: DdGowEDZKkZ4iWlWaeUAAA--.352S3 X-Coremail-Antispam: 1Uf129KBjvdXoW7JrWUJF1DZr4DJFW8WF1fXrb_yoW3trc_Cr y8Kr4UKr4rGFWIvr43CFWxZayrt3yfJFn3XFyxXay7Jw1UGr1qka92q3ZIvryrGwsxG342 yrnYgrWagw1jgjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUvcSsGvfC2KfnxnUUI43ZEXa7IUjku4UUUUUU== X-Originating-IP: [116.77.128.176] X-CM-SenderInfo: 5jhoxtpqjwt0rj6rljoofrz/1tbiJRnMmVUL8tLehgAAsP Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,RCVD_IN_DNSWL_HI,T_DKIM_INVALID,T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP For better readability, use list_is_first() instead of open-coded. Signed-off-by: Geliang Tang --- net/netfilter/ipset/ip_set_list_set.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/netfilter/ipset/ip_set_list_set.c b/net/netfilter/ipset/ip_set_list_set.c index bbede95..9d757d6 100644 --- a/net/netfilter/ipset/ip_set_list_set.c +++ b/net/netfilter/ipset/ip_set_list_set.c @@ -288,7 +288,7 @@ list_set_uadd(struct ip_set *set, void *value, const struct ip_set_ext *ext, n = list_next_entry(next, list); } else { /* Insert before prev element */ - if (prev->list.prev != &map->members) + if (!list_is_first(&prev->list, &map->members)) n = list_prev_entry(prev, list); } /* Can we replace a timed out entry? */