OpenVZ Forum


Home » Mailing lists » Devel » [PATCH 0/5] NFS: various small fixes and updates for conteinerization
[PATCH 0/5] NFS: various small fixes and updates for conteinerization [message #45070] Thu, 26 January 2012 11:11 Go to next message
Stanislav Kinsbursky is currently offline  Stanislav Kinsbursky
Messages: 683
Registered: October 2011
Senior Member
From: *parallels.com
Build fix and "init_net" replacements.

The following series consists of:

---

Stanislav Kinsbursky (5):
NFS: pass proper net rpc_pton() in nfs_dns_resolve_name()
NFS: build fixed in case of NFS_USE_NEW_IDMAPPER is undefined
NFS: search for client session id in proper network namespace
NFS: pass current net to rpc_pton() while parsing mount options
NFS: pass transport net to rpc_pton() while parse server name


fs/nfs/callback.h | 1 +
fs/nfs/callback_proc.c | 2 +-
fs/nfs/callback_xdr.c | 1 +
fs/nfs/client.c | 4 ++--
fs/nfs/dns_resolve.c | 2 +-
fs/nfs/idmap.c | 1 +
fs/nfs/internal.h | 3 ++-
fs/nfs/nfs4namespace.c | 6 +++---
fs/nfs/super.c | 4 ++--
9 files changed, 14 insertions(+), 10 deletions(-)
[PATCH 4/5] NFS: pass current net to rpc_pton() while parsing mount options [message #45071 is a reply to message #45070] Thu, 26 January 2012 11:11 Go to previous messageGo to next message
Stanislav Kinsbursky is currently offline  Stanislav Kinsbursky
Messages: 683
Registered: October 2011
Senior Member
From: *parallels.com
Signed-off-by: Stanislav Kinsbursky <skinsbursky@parallels.com>

---
fs/nfs/super.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/fs/nfs/super.c b/fs/nfs/super.c
index b79f2a1..5ed6071 100644
--- a/fs/nfs/super.c
+++ b/fs/nfs/super.c
@@ -1408,7 +1408,7 @@ static int nfs_parse_mount_options(char *raw,
if (string == NULL)
goto out_nomem;
mnt->nfs_server.addrlen =
- rpc_pton(&init_net, string, strlen(string),
+ rpc_pton(mnt->net, string, strlen(string),
(struct sockaddr *)
&mnt->nfs_server.address,
sizeof(mnt->nfs_server.address));
@@ -1430,7 +1430,7 @@ static int nfs_parse_mount_options(char *raw,
if (string == NULL)
goto out_nomem;
mnt->mount_server.addrlen =
- rpc_pton(&init_net, string, strlen(string),
+ rpc_pton(mnt->net, string, strlen(string),
(struct sockaddr *)
&mnt->mount_server.address,
sizeof(mnt->mount_server.address));
[PATCH 5/5] NFS: pass transport net to rpc_pton() while parse server name [message #45072 is a reply to message #45070] Thu, 26 January 2012 11:12 Go to previous message
Stanislav Kinsbursky is currently offline  Stanislav Kinsbursky
Messages: 683
Registered: October 2011
Senior Member
From: *parallels.com
Signed-off-by: Stanislav Kinsbursky <skinsbursky@parallels.com>

---
fs/nfs/nfs4namespace.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/fs/nfs/nfs4namespace.c b/fs/nfs/nfs4namespace.c
index 48a9acd..667ea74 100644
--- a/fs/nfs/nfs4namespace.c
+++ b/fs/nfs/nfs4namespace.c
@@ -97,11 +97,11 @@ static size_t nfs_parse_server_name(char *string, size_t len,
struct sockaddr *sa, size_t salen, struct nfs_server *server)
{
ssize_t ret;
+ struct net *net = server->client->cl_xprt->xprt_net;

- ret = rpc_pton(&init_net, string, len, sa, salen);
+ ret = rpc_pton(net, string, len, sa, salen);
if (ret == 0) {
- ret = nfs_dns_resolve_name(server->client->cl_xprt->xprt_net,
- string, len, sa, salen);
+ ret = nfs_dns_resolve_name(net, string, len, sa, salen);
if (ret < 0)
ret = 0;
}
Previous Topic: [PATCH 2/5] NFS: build fixed in case of NFS_USE_NEW_IDMAPPER is undefined
Next Topic: [PATCH iproute2 0/2] Modify iproute2 to display neighbour proxies
Goto Forum:
  


Current Time: Sat Nov 18 11:42:45 GMT 2017