Commit c1d35866 authored by Chuck Lever's avatar Chuck Lever Committed by Trond Myklebust

NFS: Change cb_recallargs to pass "struct sockaddr *" instead of sockaddr_in

Change the addr field in the cb_recallargs struct to a "struct sockaddr *"
to support non-IPv4 addresses.
Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
Cc: Aurelien Charbon <aurelien.charbon@ext.bull.net>
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent 671beed7
...@@ -53,7 +53,7 @@ struct cb_getattrres { ...@@ -53,7 +53,7 @@ struct cb_getattrres {
}; };
struct cb_recallargs { struct cb_recallargs {
struct sockaddr_in *addr; struct sockaddr *addr;
struct nfs_fh fh; struct nfs_fh fh;
nfs4_stateid stateid; nfs4_stateid stateid;
uint32_t truncate; uint32_t truncate;
......
...@@ -68,7 +68,7 @@ __be32 nfs4_callback_recall(struct cb_recallargs *args, void *dummy) ...@@ -68,7 +68,7 @@ __be32 nfs4_callback_recall(struct cb_recallargs *args, void *dummy)
__be32 res; __be32 res;
res = htonl(NFS4ERR_BADHANDLE); res = htonl(NFS4ERR_BADHANDLE);
clp = nfs_find_client(args->addr, 4); clp = nfs_find_client((struct sockaddr_in *)args->addr, 4);
if (clp == NULL) if (clp == NULL)
goto out; goto out;
......
...@@ -188,7 +188,7 @@ static __be32 decode_recall_args(struct svc_rqst *rqstp, struct xdr_stream *xdr, ...@@ -188,7 +188,7 @@ static __be32 decode_recall_args(struct svc_rqst *rqstp, struct xdr_stream *xdr,
__be32 *p; __be32 *p;
__be32 status; __be32 status;
args->addr = svc_addr_in(rqstp); args->addr = svc_addr(rqstp);
status = decode_stateid(xdr, &args->stateid); status = decode_stateid(xdr, &args->stateid);
if (unlikely(status != 0)) if (unlikely(status != 0))
goto out; goto out;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment