Commit 3dda5e43 authored by Benny Halevy's avatar Benny Halevy
Browse files

nfs41: use nfs4_fsinfo_res 



In preparation for nfs41 sequence processing.

Signed-off-by: default avatarAndy Admason <andros@netapp.com>
[define nfs4_fsinfo_res]
Signed-off-by: default avatarBenny Halevy <bhalevy@panasas.com>
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent 24ad148a

fs/nfs/nfs4proc.c

+4 −1
Original line number Diff line number Diff line
@@ -2458,10 +2458,13 @@ static int _nfs4_do_fsinfo(struct nfs_server *server, struct nfs_fh *fhandle, 
		.fh = fhandle,

		.bitmask = server->attr_bitmask,

	};

	struct nfs4_fsinfo_res res = {

		.fsinfo = fsinfo,

	};

	struct rpc_message msg = {

		.rpc_proc = &nfs4_procedures[NFSPROC4_CLNT_FSINFO],

		.rpc_argp = &args,

		.rpc_resp = fsinfo,

		.rpc_resp = &res,

	};



	return rpc_call_sync(server->client, &msg, 0);

fs/nfs/nfs4xdr.c

+3 −2
Original line number Diff line number Diff line
@@ -4351,7 +4351,8 @@ static int nfs4_xdr_dec_commit(struct rpc_rqst *rqstp, __be32 *p, struct nfs_wri 
/*

 * FSINFO request

 */

static int nfs4_xdr_dec_fsinfo(struct rpc_rqst *req, __be32 *p, struct nfs_fsinfo *fsinfo)

static int nfs4_xdr_dec_fsinfo(struct rpc_rqst *req, __be32 *p,

			       struct nfs4_fsinfo_res *res)

{

	struct xdr_stream xdr;

	struct compound_hdr hdr;
@@ -4362,7 +4363,7 @@ static int nfs4_xdr_dec_fsinfo(struct rpc_rqst *req, __be32 *p, struct nfs_fsinf 
	if (!status)

		status = decode_putfh(&xdr);

	if (!status)

		status = decode_fsinfo(&xdr, fsinfo);

		status = decode_fsinfo(&xdr, res->fsinfo);

	return status;

}

include/linux/nfs_xdr.h

+5 −0
Original line number Diff line number Diff line
@@ -675,6 +675,11 @@ struct nfs4_fsinfo_arg { 
	struct nfs4_sequence_args	seq_args;

};



struct nfs4_fsinfo_res {

	struct nfs_fsinfo	       *fsinfo;

	struct nfs4_sequence_res	seq_res;

};



struct nfs4_getattr_arg {

	const struct nfs_fh *		fh;

	const u32 *			bitmask;