Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Upgrade to 4.4.50-rt62
[kvmfornfv.git]
/
kernel
/
net
/
sunrpc
/
clnt.c
diff --git
a/kernel/net/sunrpc/clnt.c
b/kernel/net/sunrpc/clnt.c
index
23608eb
..
f28aeb2
100644
(file)
--- a/
kernel/net/sunrpc/clnt.c
+++ b/
kernel/net/sunrpc/clnt.c
@@
-337,6
+337,11
@@
out:
static DEFINE_IDA(rpc_clids);
static DEFINE_IDA(rpc_clids);
+void rpc_cleanup_clids(void)
+{
+ ida_destroy(&rpc_clids);
+}
+
static int rpc_alloc_clid(struct rpc_clnt *clnt)
{
int clid;
static int rpc_alloc_clid(struct rpc_clnt *clnt)
{
int clid;
@@
-442,7
+447,7
@@
out_no_rpciod:
return ERR_PTR(err);
}
return ERR_PTR(err);
}
-struct rpc_clnt *rpc_create_xprt(struct rpc_create_args *args,
+st
atic st
ruct rpc_clnt *rpc_create_xprt(struct rpc_create_args *args,
struct rpc_xprt *xprt)
{
struct rpc_clnt *clnt = NULL;
struct rpc_xprt *xprt)
{
struct rpc_clnt *clnt = NULL;
@@
-474,7
+479,6
@@
struct rpc_clnt *rpc_create_xprt(struct rpc_create_args *args,
return clnt;
}
return clnt;
}
-EXPORT_SYMBOL_GPL(rpc_create_xprt);
/**
* rpc_create - create an RPC client and transport with one call
/**
* rpc_create - create an RPC client and transport with one call
@@
-500,6
+504,15
@@
struct rpc_clnt *rpc_create(struct rpc_create_args *args)
};
char servername[48];
};
char servername[48];
+ if (args->bc_xprt) {
+ WARN_ON(args->protocol != XPRT_TRANSPORT_BC_TCP);
+ xprt = args->bc_xprt->xpt_bc_xprt;
+ if (xprt) {
+ xprt_get(xprt);
+ return rpc_create_xprt(args, xprt);
+ }
+ }
+
if (args->flags & RPC_CLNT_CREATE_INFINITE_SLOTS)
xprtargs.flags |= XPRT_CREATE_INFINITE_SLOTS;
if (args->flags & RPC_CLNT_CREATE_NO_IDLE_TIMEOUT)
if (args->flags & RPC_CLNT_CREATE_INFINITE_SLOTS)
xprtargs.flags |= XPRT_CREATE_INFINITE_SLOTS;
if (args->flags & RPC_CLNT_CREATE_NO_IDLE_TIMEOUT)