Commit 322d884b authored by Matthew Wilcox's avatar Matthew Wilcox
Browse files

idr: Delete idr_find_ext function 



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

Signed-off-by: default avatarMatthew Wilcox <mawilcox@microsoft.com>
parent 234a4624

include/linux/idr.h

+1 −6
Original line number Diff line number Diff line
@@ -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

net/sched/act_api.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

net/sched/cls_api.c

+1 −1
Original line number Diff line number Diff line
@@ -434,7 +434,7 @@ static struct tcf_block *tcf_block_lookup(struct net *net, u32 block_index) 
{

	struct tcf_net *tn = net_generic(net, tcf_net_id);



	return idr_find_ext(&tn->idr, block_index);

	return idr_find(&tn->idr, block_index);

}



static struct tcf_chain *tcf_block_chain_zero(struct tcf_block *block)

net/sched/cls_flower.c

+1 −1
Original line number Diff line number Diff line
@@ -334,7 +334,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] = {