[v2,07/17] idr: Delete idr_find_ext function

Message ID	20171129201922.24370-8-willy@infradead.org
State	Not Applicable, archived
Delegated to:	David Miller
Headers	show Return-Path: <netdev-owner@vger.kernel.org> From: Matthew Wilcox <willy@infradead.org> To: willy@infradead.org, netdev@vger.kernel.org Cc: Matthew Wilcox <mawilcox@microsoft.com> Subject: [PATCH v2 07/17] idr: Delete idr_find_ext function Date: Wed, 29 Nov 2017 12:19:12 -0800 Message-Id: <20171129201922.24370-8-willy@infradead.org> In-Reply-To: <20171129201922.24370-1-willy@infradead.org> References: <20171129201922.24370-1-willy@infradead.org> Sender: netdev-owner@vger.kernel.org Precedence: bulk
Series	IDR changes for v4.15-rc1 \| expand [v2,00/17] IDR changes for v4.15-rc1 [v2,01/17] idr: Fix build [v2,02/17] radix tree test suite: Remove ARRAY_SIZE [v2,03/17] idr test suite: Fix ida_test_random() [v2,04/17] IDR test suite: Check handling negative end correctly [v2,05/17] idr: Delete idr_remove_ext function [v2,06/17] idr: Delete idr_replace_ext function [v2,07/17] idr: Delete idr_find_ext function [v2,08/17] idr: Add idr_alloc_u32 helper [v2,09/17] net sched actions: Convert to use idr_alloc_u32 [v2,10/17] cls_basic: Convert to use idr_alloc_u32 [v2,11/17] cls_bpf: Convert to use idr_alloc_u32 [v2,12/17] cls_flower: Convert to idr_alloc_u32 [v2,13/17] cls_u32: Reinstate cyclic allocation [v2,14/17] cls_u32: Convert to idr_alloc_u32 [v2,15/17] idr: Rename idr_alloc_ext to idr_alloc_ul [v2,16/17] idr: Rename idr_for_each_entry_ext [v2,17/17] idr: Warn if old iterators see large IDs

Message ID

20171129201922.24370-8-willy@infradead.org

State

Not Applicable, archived

Delegated to:

David Miller

Headers

From: Matthew Wilcox <willy@infradead.org>
To: willy@infradead.org, netdev@vger.kernel.org
Cc: Matthew Wilcox <mawilcox@microsoft.com>
Subject: [PATCH v2 07/17] idr: Delete idr_find_ext function
Date: Wed, 29 Nov 2017 12:19:12 -0800
Message-Id: <20171129201922.24370-8-willy@infradead.org>
In-Reply-To: <20171129201922.24370-1-willy@infradead.org>
References: <20171129201922.24370-1-willy@infradead.org>
Sender: netdev-owner@vger.kernel.org
Precedence: bulk

Series

IDR changes for v4.15-rc1 | expand

Commit Message

Matthew Wilcox (Oracle) Nov. 29, 2017, 8:19 p.m. UTC

From: Matthew Wilcox <mawilcox@microsoft.com>

Simply changing idr_remove's 'id' argument to 'unsigned long' works
for all callers.

Signed-off-by: Matthew Wilcox <mawilcox@microsoft.com>
---
 include/linux/idr.h    | 7 +------
 net/sched/act_api.c    | 2 +-
 net/sched/cls_flower.c | 2 +-
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/include/linux/idr.h b/include/linux/idr.h
index 90dbe7a3735c..12514ec0cd28 100644
--- a/include/linux/idr.h
+++ b/include/linux/idr.h
@@ -179,16 +179,11 @@  static inline void idr_preload_end(void)
  * This function can be called under rcu_read_lock(), given that the leaf
  * pointers lifetimes are correctly managed.
  */
-static inline void *idr_find_ext(const struct idr *idr, unsigned long id)
+static inline void *idr_find(const struct idr *idr, unsigned long id)
 {
 	return radix_tree_lookup(&idr->idr_rt, id);
 }
 
-static inline void *idr_find(const struct idr *idr, int id)
-{
-	return idr_find_ext(idr, id);
-}
-
 /**
  * idr_for_each_entry - iterate over an idr's elements of a given type
  * @idr:     idr handle
diff --git a/net/sched/act_api.c b/net/sched/act_api.c
index 7e901e855d68..efb90b8a3bf0 100644
--- a/net/sched/act_api.c
+++ b/net/sched/act_api.c
@@ -222,7 +222,7 @@  static struct tc_action *tcf_idr_lookup(u32 index, struct tcf_idrinfo *idrinfo)
 	struct tc_action *p = NULL;
 
 	spin_lock_bh(&idrinfo->lock);
-	p = idr_find_ext(&idrinfo->action_idr, index);
+	p = idr_find(&idrinfo->action_idr, index);
 	spin_unlock_bh(&idrinfo->lock);
 
 	return p;
diff --git a/net/sched/cls_flower.c b/net/sched/cls_flower.c
index ca71823bee03..ec0dc92f6104 100644
--- a/net/sched/cls_flower.c
+++ b/net/sched/cls_flower.c
@@ -329,7 +329,7 @@  static void *fl_get(struct tcf_proto *tp, u32 handle)
 {
 	struct cls_fl_head *head = rtnl_dereference(tp->root);
 
-	return idr_find_ext(&head->handle_idr, handle);
+	return idr_find(&head->handle_idr, handle);
 }
 
 static const struct nla_policy fl_policy[TCA_FLOWER_MAX + 1] = {

[v2,07/17] idr: Delete idr_find_ext function

Commit Message

Patch