From mboxrd@z Thu Jan 1 00:00:00 1970 From: Matthew Wilcox Subject: [PATCH 12/26] Convert net_namespace to new IDA API Date: Thu, 21 Jun 2018 14:28:21 -0700 Message-ID: <20180621212835.5636-13-willy@infradead.org> References: <20180621212835.5636-1-willy@infradead.org> Cc: Matthew Wilcox , "David S. Miller" , Kirill Tkhai , Andrei Vagin , "Eric W. Biederman" , Eric Dumazet , Florian Westphal , netdev@vger.kernel.org To: linux-kernel@vger.kernel.org Return-path: In-Reply-To: <20180621212835.5636-1-willy@infradead.org> Sender: linux-kernel-owner@vger.kernel.org List-Id: netdev.vger.kernel.org Signed-off-by: Matthew Wilcox --- net/core/net_namespace.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/net/core/net_namespace.c b/net/core/net_namespace.c index a11e03f920d3..f447cebdcea3 100644 --- a/net/core/net_namespace.c +++ b/net/core/net_namespace.c @@ -973,22 +973,18 @@ static int register_pernet_operations(struct list_head *list, int error; if (ops->id) { -again: - error = ida_get_new_above(&net_generic_ids, MIN_PERNET_OPS_ID, ops->id); - if (error < 0) { - if (error == -EAGAIN) { - ida_pre_get(&net_generic_ids, GFP_KERNEL); - goto again; - } + error = ida_alloc_min(&net_generic_ids, MIN_PERNET_OPS_ID, + GFP_KERNEL); + if (error < 0) return error; - } + *ops->id = error; max_gen_ptrs = max(max_gen_ptrs, *ops->id + 1); } error = __register_pernet_operations(list, ops); if (error) { rcu_barrier(); if (ops->id) - ida_remove(&net_generic_ids, *ops->id); + ida_free(&net_generic_ids, *ops->id); } return error; @@ -999,7 +995,7 @@ static void unregister_pernet_operations(struct pernet_operations *ops) __unregister_pernet_operations(ops); rcu_barrier(); if (ops->id) - ida_remove(&net_generic_ids, *ops->id); + ida_free(&net_generic_ids, *ops->id); } /** -- 2.17.1