hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

sunrpc: Tag rpc_xprt with net 

The net is known from the xprt_create and this tagging will also
give un the context in the conntection workers where real sockets
are created.

Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
This commit is contained in:
Pavel Emelyanov 2010-09-29 16:05:43 +04:00 committed by J. Bruce Fields
parent 9a23e332ec
commit 37aa213373
4 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/linux/sunrpc/xprt.h
View File

@ -224,6 +224,7 @@ struct rpc_xprt {
bklog_u; /* backlog queue utilization */ bklog_u; /* backlog queue utilization */
} stat; } stat;
struct net *xprt_net;
const char *address_strings[RPC_DISPLAY_MAX]; const char *address_strings[RPC_DISPLAY_MAX];
}; };
@ -281,7 +282,7 @@ void xprt_release_xprt_cong(struct rpc_xprt *xprt, struct rpc_task *task);
void xprt_release(struct rpc_task *task); void xprt_release(struct rpc_task *task);
struct rpc_xprt * xprt_get(struct rpc_xprt *xprt); struct rpc_xprt * xprt_get(struct rpc_xprt *xprt);
void xprt_put(struct rpc_xprt *xprt); void xprt_put(struct rpc_xprt *xprt);
struct rpc_xprt * xprt_alloc(int size, int max_req); struct rpc_xprt * xprt_alloc(struct net *net, int size, int max_req);
void xprt_free(struct rpc_xprt *); void xprt_free(struct rpc_xprt *);
static inline __be32 *xprt_skip_transport_header(struct rpc_xprt *xprt, __be32 *p) static inline __be32 *xprt_skip_transport_header(struct rpc_xprt *xprt, __be32 *p)

4
net/sunrpc/xprt.c
View File

@ -962,7 +962,7 @@ static void xprt_free_slot(struct rpc_xprt *xprt, struct rpc_rqst *req)
spin_unlock(&xprt->reserve_lock); spin_unlock(&xprt->reserve_lock);
} }
struct rpc_xprt *xprt_alloc(int size, int max_req) struct rpc_xprt *xprt_alloc(struct net *net, int size, int max_req)
{ {
struct rpc_xprt *xprt; struct rpc_xprt *xprt;
@ -975,6 +975,7 @@ struct rpc_xprt *xprt_alloc(int size, int max_req)
if (xprt->slot == NULL) if (xprt->slot == NULL)
goto out_free; goto out_free;
xprt->xprt_net = get_net(net);
return xprt; return xprt;
out_free: out_free:
@ -986,6 +987,7 @@ EXPORT_SYMBOL_GPL(xprt_alloc);
void xprt_free(struct rpc_xprt *xprt) void xprt_free(struct rpc_xprt *xprt)
{ {
put_net(xprt->xprt_net);
kfree(xprt->slot); kfree(xprt->slot);
kfree(xprt); kfree(xprt);
} }

2
net/sunrpc/xprtrdma/transport.c
View File

@ -283,7 +283,7 @@ xprt_setup_rdma(struct xprt_create *args)
return ERR_PTR(-EBADF); return ERR_PTR(-EBADF);
} }
xprt = xprt_alloc(sizeof(struct rpcrdma_xprt), xprt = xprt_alloc(args->net, sizeof(struct rpcrdma_xprt),
xprt_rdma_slot_table_entries); xprt_rdma_slot_table_entries);
if (xprt == NULL) { if (xprt == NULL) {
dprintk("RPC: %s: couldn't allocate rpcrdma_xprt\n", dprintk("RPC: %s: couldn't allocate rpcrdma_xprt\n",

2
net/sunrpc/xprtsock.c
View File

@ -2272,7 +2272,7 @@ static struct rpc_xprt *xs_setup_xprt(struct xprt_create *args,
return ERR_PTR(-EBADF); return ERR_PTR(-EBADF);
} }
xprt = xprt_alloc(sizeof(*new), slot_table_size); xprt = xprt_alloc(args->net, sizeof(*new), slot_table_size);
if (xprt == NULL) { if (xprt == NULL) {
dprintk("RPC: xs_setup_xprt: couldn't allocate " dprintk("RPC: xs_setup_xprt: couldn't allocate "
"rpc_xprt\n"); "rpc_xprt\n");