SUNRPC: Directly use ida_alloc()/free()

Use ida_alloc()/ida_free() instead of
ida_simple_get()/ida_simple_remove().
The latter is deprecated and more verbose.

Signed-off-by: Bo Liu <liubo03@inspur.com>
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>

diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c
index c284efa3d1efc2ef4ccab136911365ead224f22d..4d8665f15dd7eb44947c44548ddb021832cced84 100644 (file)
--- a/net/sunrpc/clnt.c
+++ b/net/sunrpc/clnt.c
@@ -345,7 +345,7 @@ static int rpc_alloc_clid(struct rpc_clnt *clnt)
 {
        int clid;
 
-       clid = ida_simple_get(&rpc_clids, 0, 0, GFP_KERNEL);
+       clid = ida_alloc(&rpc_clids, GFP_KERNEL);
        if (clid < 0)
                return clid;
        clnt->cl_clid = clid;
@@ -354,7 +354,7 @@ static int rpc_alloc_clid(struct rpc_clnt *clnt)
 
 static void rpc_free_clid(struct rpc_clnt *clnt)
 {
-       ida_simple_remove(&rpc_clids, clnt->cl_clid);
+       ida_free(&rpc_clids, clnt->cl_clid);
 }
 
 static struct rpc_clnt * rpc_new_client(const struct rpc_create_args *args,

diff --git a/net/sunrpc/xprt.c b/net/sunrpc/xprt.c
index f8fae78156494c19e0aae8270d187155d696608c..a50febadb37e979512b6848a882939d8350bd345 100644 (file)
--- a/net/sunrpc/xprt.c
+++ b/net/sunrpc/xprt.c
@@ -1788,7 +1788,7 @@ static int xprt_alloc_id(struct rpc_xprt *xprt)
 {
        int id;
 
-       id = ida_simple_get(&rpc_xprt_ids, 0, 0, GFP_KERNEL);
+       id = ida_alloc(&rpc_xprt_ids, GFP_KERNEL);
        if (id < 0)
                return id;
 
@@ -1798,7 +1798,7 @@ static int xprt_alloc_id(struct rpc_xprt *xprt)
 
 static void xprt_free_id(struct rpc_xprt *xprt)
 {
-       ida_simple_remove(&rpc_xprt_ids, xprt->id);
+       ida_free(&rpc_xprt_ids, xprt->id);
 }
 
 struct rpc_xprt *xprt_alloc(struct net *net, size_t size,

diff --git a/net/sunrpc/xprtmultipath.c b/net/sunrpc/xprtmultipath.c
index 685db598acbe1a5db1ea73e3f1482c10ebb042b9..701250b305dba9c1cf809738361a929dd35e523e 100644 (file)
--- a/net/sunrpc/xprtmultipath.c
+++ b/net/sunrpc/xprtmultipath.c
@@ -103,7 +103,7 @@ static int xprt_switch_alloc_id(struct rpc_xprt_switch *xps, gfp_t gfp_flags)
 {
        int id;
 
-       id = ida_simple_get(&rpc_xprtswitch_ids, 0, 0, gfp_flags);
+       id = ida_alloc(&rpc_xprtswitch_ids, gfp_flags);
        if (id < 0)
                return id;
 
@@ -113,7 +113,7 @@ static int xprt_switch_alloc_id(struct rpc_xprt_switch *xps, gfp_t gfp_flags)
 
 static void xprt_switch_free_id(struct rpc_xprt_switch *xps)
 {
-       ida_simple_remove(&rpc_xprtswitch_ids, xps->xps_id);
+       ida_free(&rpc_xprtswitch_ids, xps->xps_id);
 }
 
 /**