Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 671beed7 authored by Chuck Lever's avatar Chuck Lever Committed by Trond Myklebust
Browse files

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



Change the addr field in the cb_getattrargs 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 6e4cffd7

fs/nfs/callback.h

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ struct cb_compound_hdr_res { 
};



struct cb_getattrargs {

	struct sockaddr_in *addr;

	struct sockaddr *addr;

	struct nfs_fh fh;

	uint32_t bitmap[2];

};

fs/nfs/callback_proc.c

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ __be32 nfs4_callback_getattr(struct cb_getattrargs *args, struct cb_getattrres * 


	res->bitmap[0] = res->bitmap[1] = 0;

	res->status = 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;

fs/nfs/callback_xdr.c

+1 −1
Original line number Diff line number Diff line
@@ -176,7 +176,7 @@ static __be32 decode_getattr_args(struct svc_rqst *rqstp, struct xdr_stream *xdr 
	status = decode_fh(xdr, &args->fh);

	if (unlikely(status != 0))

		goto out;

	args->addr = svc_addr_in(rqstp);

	args->addr = svc_addr(rqstp);

	status = decode_bitmap(xdr, args->bitmap);

out:

	dprintk("%s: exit with status = %d\n", __FUNCTION__, ntohl(status));