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

Commit 24ad148a authored Apr 01, 2009 by Benny Halevy

nfs41: use nfs4_statfs_res



In preparation for nfs41 sequence processing.

Signed-off-by: Andy Admason <andros@netapp.com>
[define nfs4_statfs_res]
Signed-off-by: Benny Halevy <bhalevy@panasas.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>

parent f50c7000

fs/nfs/nfs4proc.c

+4 −1

Original line number	Original line	Diff line number	Diff line
	@@ -2426,10 +2426,13 @@ static int _nfs4_proc_statfs(struct nfs_server server, struct nfs_fh fhandle,
	.fh = fhandle,		.fh = fhandle,
	.bitmask = server->attr_bitmask,		.bitmask = server->attr_bitmask,
	};		};
			struct nfs4_statfs_res res = {
			.fsstat = fsstat,
			};
	struct rpc_message msg = {		struct rpc_message msg = {
	.rpc_proc = &nfs4_procedures[NFSPROC4_CLNT_STATFS],		.rpc_proc = &nfs4_procedures[NFSPROC4_CLNT_STATFS],
	.rpc_argp = &args,		.rpc_argp = &args,
	.rpc_resp = fsstat,		.rpc_resp = &res,
	};		};

	nfs_fattr_init(fsstat->fattr);		nfs_fattr_init(fsstat->fattr);

fs/nfs/nfs4xdr.c

+3 −2

Original line number	Original line	Diff line number	Diff line
	@@ -4387,7 +4387,8 @@ static int nfs4_xdr_dec_pathconf(struct rpc_rqst req, __be32 p, struct nfs_pat
	/*		/*
	* STATFS request		* STATFS request
	*/		*/
	static int nfs4_xdr_dec_statfs(struct rpc_rqst req, __be32 p, struct nfs_fsstat *fsstat)		static int nfs4_xdr_dec_statfs(struct rpc_rqst req, __be32 p,
			struct nfs4_statfs_res *res)
	{		{
	struct xdr_stream xdr;		struct xdr_stream xdr;
	struct compound_hdr hdr;		struct compound_hdr hdr;
	@@ -4398,7 +4399,7 @@ static int nfs4_xdr_dec_statfs(struct rpc_rqst req, __be32 p, struct nfs_fssta
	if (!status)		if (!status)
	status = decode_putfh(&xdr);		status = decode_putfh(&xdr);
	if (!status)		if (!status)
	status = decode_statfs(&xdr, fsstat);		status = decode_statfs(&xdr, res->fsstat);
	return status;		return status;
	}		}

include/linux/nfs_xdr.h

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -795,6 +795,11 @@ struct nfs4_statfs_arg {
	struct nfs4_sequence_args seq_args;		struct nfs4_sequence_args seq_args;
	};		};

			struct nfs4_statfs_res {
			struct nfs_fsstat *fsstat;
			struct nfs4_sequence_res seq_res;
			};

	struct nfs4_server_caps_arg {		struct nfs4_server_caps_arg {
	struct nfs_fh *fhandle;		struct nfs_fh *fhandle;
	struct nfs4_sequence_args seq_args;		struct nfs4_sequence_args seq_args;