Skip to content

Commit

Permalink
NFS: Change cb_recallargs to pass "struct sockaddr *" instead of sock…
Browse files Browse the repository at this point in the history
…addr_in

Change the addr field in the cb_recallargs struct to a "struct sockaddr *"
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 671beed commit c1d3586
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion fs/nfs/callback.h
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ struct cb_getattrres {
};

struct cb_recallargs {
struct sockaddr_in *addr;
struct sockaddr *addr;
struct nfs_fh fh;
nfs4_stateid stateid;
uint32_t truncate;
Expand Down
2 changes: 1 addition & 1 deletion fs/nfs/callback_proc.c
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ __be32 nfs4_callback_recall(struct cb_recallargs *args, void *dummy)
__be32 res;

res = htonl(NFS4ERR_BADHANDLE);
clp = nfs_find_client(args->addr, 4);
clp = nfs_find_client((struct sockaddr_in *)args->addr, 4);
if (clp == NULL)
goto out;

Expand Down
2 changes: 1 addition & 1 deletion fs/nfs/callback_xdr.c
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ static __be32 decode_recall_args(struct svc_rqst *rqstp, struct xdr_stream *xdr,
__be32 *p;
__be32 status;

args->addr = svc_addr_in(rqstp);
args->addr = svc_addr(rqstp);
status = decode_stateid(xdr, &args->stateid);
if (unlikely(status != 0))
goto out;
Expand Down

0 comments on commit c1d3586

Please sign in to comment.