From: Matthew Wilcox <willy@infradead.org>
Date: Sun, 17 Jun 2018 09:37:08 +0000 (-0400)
Subject: Convert net_namespace to new IDA API
X-Git-Tag: v4.19-rc1~2^2~15
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6e77cc471090a2f37802cb328bffe4ce56f4ce18;p=thirdparty%2Fkernel%2Flinux.git

Convert net_namespace to new IDA API

Signed-off-by: Matthew Wilcox <willy@infradead.org>
---

diff --git a/net/core/net_namespace.c b/net/core/net_namespace.c
index a11e03f920d3a..f447cebdcea37 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);
 }
 
 /**