lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

NFS: decode destination address in proper network namespace context

Browse Source 
This patch replaces "init_net" with NFS client's owner net in rpc_pton() call
in decode_ds_addr().

Signed-off-by: Stanislav Kinsbursky <skinsbursky@parallels.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
This commit is contained in:
Stanislav Kinsbursky
2012-01-19 19:05:57 +04:00
committed by Trond Myklebust
parent 599ec129c2
commit 170942726b
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
fs/nfs/nfs4filelayoutdev.c
View File

@@ -378,7 +378,7 @@ out:
* Currently only supports ipv4, ipv6 and one multi-path address. * Currently only supports ipv4, ipv6 and one multi-path address.
*/ */
static struct nfs4_pnfs_ds_addr * static struct nfs4_pnfs_ds_addr *
decode_ds_addr(struct xdr_stream *streamp, gfp_t gfp_flags) decode_ds_addr(struct net *net, struct xdr_stream *streamp, gfp_t gfp_flags)
{ {
struct nfs4_pnfs_ds_addr *da = NULL; struct nfs4_pnfs_ds_addr *da = NULL;
char *buf, *portstr; char *buf, *portstr;
@@ -457,7 +457,7 @@ decode_ds_addr(struct xdr_stream *streamp, gfp_t gfp_flags)
INIT_LIST_HEAD(&da->da_node); INIT_LIST_HEAD(&da->da_node);
if (!rpc_pton(&init_net, buf, portstr-buf, (struct sockaddr *)&da->da_addr, if (!rpc_pton(net, buf, portstr-buf, (struct sockaddr *)&da->da_addr,
sizeof(da->da_addr))) { sizeof(da->da_addr))) {
dprintk("%s: error parsing address %s\n", __func__, buf); dprintk("%s: error parsing address %s\n", __func__, buf);
goto out_free_da; goto out_free_da;
@@ -625,7 +625,8 @@ decode_device(struct inode *ino, struct pnfs_device *pdev, gfp_t gfp_flags)
mp_count = be32_to_cpup(p); /* multipath count */ mp_count = be32_to_cpup(p); /* multipath count */
for (j = 0; j < mp_count; j++) { for (j = 0; j < mp_count; j++) {
da = decode_ds_addr(&stream, gfp_flags); da = decode_ds_addr(NFS_SERVER(ino)->nfs_client->net,
&stream, gfp_flags);
if (da) if (da)
list_add_tail(&da->da_node, &dsaddrs); list_add_tail(&da->da_node, &dsaddrs);
} }