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

Commit d45b2989 authored by Benny Halevy's avatar Benny Halevy
Browse files

nfs41: use nfs4_pathconf_res 



In preparation for nfs41 sequence processing.

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

fs/nfs/nfs4proc.c

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

		.bitmask = server->attr_bitmask,

	};

	struct nfs4_pathconf_res res = {

		.pathconf = pathconf,

	};

	struct rpc_message msg = {

		.rpc_proc = &nfs4_procedures[NFSPROC4_CLNT_PATHCONF],

		.rpc_argp = &args,

		.rpc_resp = pathconf,

		.rpc_resp = &res,

	};



	/* None of the pathconf attributes are mandatory to implement */

fs/nfs/nfs4xdr.c

+3 −2
Original line number Diff line number Diff line
@@ -4370,7 +4370,8 @@ static int nfs4_xdr_dec_fsinfo(struct rpc_rqst *req, __be32 *p, 
/*

 * PATHCONF request

 */

static int nfs4_xdr_dec_pathconf(struct rpc_rqst *req, __be32 *p, struct nfs_pathconf *pathconf)

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

				 struct nfs4_pathconf_res *res)

{

	struct xdr_stream xdr;

	struct compound_hdr hdr;
@@ -4381,7 +4382,7 @@ static int nfs4_xdr_dec_pathconf(struct rpc_rqst *req, __be32 *p, struct nfs_pat 
	if (!status)

		status = decode_putfh(&xdr);

	if (!status)

		status = decode_pathconf(&xdr, pathconf);

		status = decode_pathconf(&xdr, res->pathconf);

	return status;

}

include/linux/nfs_xdr.h

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

};



struct nfs4_pathconf_res {

	struct nfs_pathconf	       *pathconf;

	struct nfs4_sequence_res	seq_res;

};



struct nfs4_readdir_arg {

	const struct nfs_fh *		fh;

	u64				cookie;