Skip to content

Commit

Permalink
NFS: Change nfs_get_client() to take sockaddr *
Browse files Browse the repository at this point in the history
Adjust arguments and callers of nfs_get_client() to pass a
"struct sockaddr *" instead of "struct sockaddr_in *" to support
non-IPv4 addresses.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Cc: Aurelien Charbon <aurelien.charbon@ext.bull.net>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
  • Loading branch information
Chuck Lever authored and Trond Myklebust committed Jan 30, 2008
1 parent ff05264 commit d7422c4
Showing 1 changed file with 5 additions and 6 deletions.
11 changes: 5 additions & 6 deletions fs/nfs/client.c
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ struct rpc_program nfsacl_program = {

struct nfs_client_initdata {
const char *hostname;
const struct sockaddr_in *addr;
const struct sockaddr *addr;
size_t addrlen;
const struct nfs_rpc_ops *rpc_ops;
};
Expand Down Expand Up @@ -308,9 +308,8 @@ static struct nfs_client *nfs_get_client(const struct nfs_client_initdata *cl_in
struct nfs_client *clp, *new = NULL;
int error;

dprintk("--> nfs_get_client(%s,"NIPQUAD_FMT":%d,%u)\n",
cl_init->hostname ?: "", NIPQUAD(cl_init->addr->sin_addr),
cl_init->addr->sin_port, cl_init->rpc_ops->version);
dprintk("--> nfs_get_client(%s,v%u)\n",
cl_init->hostname ?: "", cl_init->rpc_ops->version);

/* see if the client already exists */
do {
Expand Down Expand Up @@ -581,7 +580,7 @@ static int nfs_init_server(struct nfs_server *server,
{
struct nfs_client_initdata cl_init = {
.hostname = data->nfs_server.hostname,
.addr = &data->nfs_server.address,
.addr = (const struct sockaddr *)&data->nfs_server.address,
.addrlen = sizeof(data->nfs_server.address),
.rpc_ops = &nfs_v2_clientops,
};
Expand Down Expand Up @@ -935,7 +934,7 @@ static int nfs4_set_client(struct nfs_server *server,
{
struct nfs_client_initdata cl_init = {
.hostname = hostname,
.addr = addr,
.addr = (const struct sockaddr *)addr,
.addrlen = sizeof(*addr),
.rpc_ops = &nfs_v4_clientops,
};
Expand Down

0 comments on commit d7422c4

Please sign in to comment.