From: Pavel Emelyanov <xemul@parallels.com>
To: "J. Bruce Fields" <bfields@fieldses.org>
Cc: Chuck Lever <chuck.lever@oracle.com>,
Trond Myklebust <Trond.Myklebust@netapp.com>,
linux-nfs@vger.kernel.org
Subject: [PATCH 7/9] sunrpc: Tag rpc_xprt with net
Date: Wed, 29 Sep 2010 16:05:43 +0400 [thread overview]
Message-ID: <4CA32B97.9000802@parallels.com> (raw)
In-Reply-To: <4CA32AB4.2090808@parallels.com>
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>
---
include/linux/sunrpc/xprt.h | 3 ++-
net/sunrpc/xprt.c | 4 +++-
net/sunrpc/xprtrdma/transport.c | 2 +-
net/sunrpc/xprtsock.c | 2 +-
4 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/include/linux/sunrpc/xprt.h b/include/linux/sunrpc/xprt.h
index c4f9315..89d10d2 100644
--- a/include/linux/sunrpc/xprt.h
+++ b/include/linux/sunrpc/xprt.h
@@ -224,6 +224,7 @@ struct rpc_xprt {
bklog_u; /* backlog queue utilization */
} stat;
+ struct net *xprt_net;
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);
struct rpc_xprt * xprt_get(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 *);
static inline __be32 *xprt_skip_transport_header(struct rpc_xprt *xprt, __be32 *p)
diff --git a/net/sunrpc/xprt.c b/net/sunrpc/xprt.c
index 0637340..953206d 100644
--- a/net/sunrpc/xprt.c
+++ b/net/sunrpc/xprt.c
@@ -962,7 +962,7 @@ static void xprt_free_slot(struct rpc_xprt *xprt, struct rpc_rqst *req)
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;
@@ -975,6 +975,7 @@ struct rpc_xprt *xprt_alloc(int size, int max_req)
if (xprt->slot == NULL)
goto out_free;
+ xprt->xprt_net = get_net(net);
return xprt;
out_free:
@@ -986,6 +987,7 @@ EXPORT_SYMBOL_GPL(xprt_alloc);
void xprt_free(struct rpc_xprt *xprt)
{
+ put_net(xprt->xprt_net);
kfree(xprt->slot);
kfree(xprt);
}
diff --git a/net/sunrpc/xprtrdma/transport.c b/net/sunrpc/xprtrdma/transport.c
index 0f7a1b9..2da32b4 100644
--- a/net/sunrpc/xprtrdma/transport.c
+++ b/net/sunrpc/xprtrdma/transport.c
@@ -283,7 +283,7 @@ xprt_setup_rdma(struct xprt_create *args)
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);
if (xprt == NULL) {
dprintk("RPC: %s: couldn't allocate rpcrdma_xprt\n",
diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c
index b1e36ec..4ef3a6a 100644
--- a/net/sunrpc/xprtsock.c
+++ b/net/sunrpc/xprtsock.c
@@ -2272,7 +2272,7 @@ static struct rpc_xprt *xs_setup_xprt(struct xprt_create *args,
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) {
dprintk("RPC: xs_setup_xprt: couldn't allocate "
"rpc_xprt\n");
--
1.5.5.6
next prev parent reply other threads:[~2010-09-29 12:05 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-09-29 12:01 [PATCH v3 0/9] sunrpc: Create sockets in namespaces Pavel Emelyanov
2010-09-29 12:02 ` [PATCH 1/9] sunrpc: Factor out rpc_xprt allocation Pavel Emelyanov
2010-09-29 12:03 ` [PATCH 2/9] sunrpc: Factor out rpc_xprt freeing Pavel Emelyanov
2010-09-29 12:03 ` [PATCH 3/9] sunrpc: Add net argument to svc_create_xprt Pavel Emelyanov
2010-09-29 12:04 ` [PATCH 4/9] sunrpc: Pull net argument downto svc_create_socket Pavel Emelyanov
2010-09-29 12:04 ` [PATCH 5/9] sunrpc: Add net to rpc_create_args Pavel Emelyanov
2010-09-29 12:05 ` [PATCH 6/9] sunrpc: Add net to xprt_create Pavel Emelyanov
2010-09-29 12:05 ` Pavel Emelyanov [this message]
2010-09-29 12:06 ` [PATCH 8/9] net: Export __sock_create Pavel Emelyanov
2010-09-29 12:06 ` [PATCH 9/9] sunrpc: Create sockets in net namespaces Pavel Emelyanov
2010-09-29 21:45 ` [PATCH v3 0/9] sunrpc: Create sockets in namespaces J. Bruce Fields
2010-09-29 21:49 ` Chuck Lever
2010-09-30 5:46 ` Pavel Emelyanov
2010-09-30 15:16 ` Chuck Lever
2010-09-30 15:34 ` Pavel Emelyanov
2010-10-01 22:05 ` J. Bruce Fields
2011-07-20 21:10 ` J. Bruce Fields
2011-07-21 7:50 ` Pavel Emelyanov
2011-07-21 16:30 ` J. Bruce Fields
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4CA32B97.9000802@parallels.com \
--to=xemul@parallels.com \
--cc=Trond.Myklebust@netapp.com \
--cc=bfields@fieldses.org \
--cc=chuck.lever@oracle.com \
--cc=linux-nfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).