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

Commit 7d974794 authored by Bryan Schumaker's avatar Bryan Schumaker Committed by Trond Myklebust
Browse files

NFS: Added TEST_STATEID call 



This patch adds in the xdr for doing a TEST_STATEID call with a single
stateid. RFC 5661 allows multiple stateids to be tested in a single
call, but only testing one keeps things simpler for now.

Signed-off-by: default avatarBryan Schumaker <bjschuma@netapp.com>
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent fca78d6d

fs/nfs/nfs4proc.c

+28 −0
Original line number Diff line number Diff line
@@ -6015,6 +6015,34 @@ out_freepage: 
out:

	return err;

}

static int _nfs41_test_stateid(struct nfs_server *server, struct nfs4_state *state)

{

	int status;

	struct nfs41_test_stateid_args args = {

		.stateid = &state->stateid,

	};

	struct nfs41_test_stateid_res res;

	struct rpc_message msg = {

		.rpc_proc = &nfs4_procedures[NFSPROC4_CLNT_TEST_STATEID],

		.rpc_argp = &args,

		.rpc_resp = &res,

	};

	args.seq_args.sa_session = res.seq_res.sr_session = NULL;

	status = nfs4_call_sync_sequence(server->client, server, &msg, &args.seq_args, &res.seq_res, 0, 1);

	return status;

}



static int nfs41_test_stateid(struct nfs_server *server, struct nfs4_state *state)

{

	struct nfs4_exception exception = { };

	int err;

	do {

		err = nfs4_handle_exception(server,

				_nfs41_test_stateid(server, state),

				&exception);

	} while (exception.retry);

	return err;

}

#endif /* CONFIG_NFS_V4_1 */



struct nfs4_state_recovery_ops nfs40_reboot_recovery_ops = {

fs/nfs/nfs4xdr.c

+91 −0
Original line number Diff line number Diff line
@@ -345,6 +345,9 @@ static int nfs4_stat_to_errno(int); 
				1 + decode_stateid_maxsz)

#define encode_secinfo_no_name_maxsz (op_encode_hdr_maxsz + 1)

#define decode_secinfo_no_name_maxsz decode_secinfo_maxsz

#define encode_test_stateid_maxsz	(op_encode_hdr_maxsz + 2 + \

					 XDR_QUADLEN(NFS4_STATEID_SIZE))

#define decode_test_stateid_maxsz	(op_decode_hdr_maxsz + 2 + 1)

#else /* CONFIG_NFS_V4_1 */

#define encode_sequence_maxsz	0

#define decode_sequence_maxsz	0
@@ -782,6 +785,12 @@ static int nfs4_stat_to_errno(int); 
					decode_sequence_maxsz + \

					decode_putrootfh_maxsz + \

					decode_secinfo_no_name_maxsz)

#define NFS4_enc_test_stateid_sz	(compound_encode_hdr_maxsz + \

					 encode_sequence_maxsz + \

					 encode_test_stateid_maxsz)

#define NFS4_dec_test_stateid_sz	(compound_decode_hdr_maxsz + \

					 decode_sequence_maxsz + \

					 decode_test_stateid_maxsz)



const u32 nfs41_maxwrite_overhead = ((RPC_MAX_HEADER_WITH_AUTH +

				      compound_encode_hdr_maxsz +
@@ -1962,6 +1971,20 @@ encode_secinfo_no_name(struct xdr_stream *xdr, 
	hdr->replen += decode_secinfo_no_name_maxsz;

	return 0;

}



static void encode_test_stateid(struct xdr_stream *xdr,

				struct nfs41_test_stateid_args *args,

				struct compound_hdr *hdr)

{

	__be32 *p;



	p = reserve_space(xdr, 8 + NFS4_STATEID_SIZE);

	*p++ = cpu_to_be32(OP_TEST_STATEID);

	*p++ = cpu_to_be32(1);

	xdr_encode_opaque_fixed(p, args->stateid->data, NFS4_STATEID_SIZE);

	hdr->nops++;

	hdr->replen += decode_test_stateid_maxsz;

}

#endif /* CONFIG_NFS_V4_1 */



/*
@@ -2833,6 +2856,23 @@ static int nfs4_xdr_enc_secinfo_no_name(struct rpc_rqst *req, 
	encode_nops(&hdr);

	return 0;

}



/*

 *  Encode TEST_STATEID request

 */

static void nfs4_xdr_enc_test_stateid(struct rpc_rqst *req,

				      struct xdr_stream *xdr,

				      struct nfs41_test_stateid_args *args)

{

	struct compound_hdr hdr = {

		.minorversion = nfs4_xdr_minorversion(&args->seq_args),

	};



	encode_compound_hdr(xdr, req, &hdr);

	encode_sequence(xdr, &args->seq_args, &hdr);

	encode_test_stateid(xdr, args, &hdr);

	encode_nops(&hdr);

}

#endif /* CONFIG_NFS_V4_1 */



static void print_overflow_msg(const char *func, const struct xdr_stream *xdr)
@@ -5371,6 +5411,35 @@ out_overflow: 
	print_overflow_msg(__func__, xdr);

	return -EIO;

}



static int decode_test_stateid(struct xdr_stream *xdr,

			       struct nfs41_test_stateid_res *res)

{

	__be32 *p;

	int status;

	int num_res;



	status = decode_op_hdr(xdr, OP_TEST_STATEID);

	if (status)

		return status;



	p = xdr_inline_decode(xdr, 4);

	if (unlikely(!p))

		goto out_overflow;

	num_res = be32_to_cpup(p++);

	if (num_res != 1)

		goto out;



	p = xdr_inline_decode(xdr, 4);

	if (unlikely(!p))

		goto out_overflow;

	res->status = be32_to_cpup(p++);

	return res->status;

out_overflow:

	print_overflow_msg(__func__, xdr);

out:

	return -EIO;

}

#endif /* CONFIG_NFS_V4_1 */



/*
@@ -6534,6 +6603,27 @@ static int nfs4_xdr_dec_secinfo_no_name(struct rpc_rqst *rqstp, 
out:

	return status;

}



/*

 * Decode TEST_STATEID response

 */

static int nfs4_xdr_dec_test_stateid(struct rpc_rqst *rqstp,

				     struct xdr_stream *xdr,

				     struct nfs41_test_stateid_res *res)

{

	struct compound_hdr hdr;

	int status;



	status = decode_compound_hdr(xdr, &hdr);

	if (status)

		goto out;

	status = decode_sequence(xdr, &res->seq_res, rqstp);

	if (status)

		goto out;

	status = decode_test_stateid(xdr, res);

out:

	return status;

}

#endif /* CONFIG_NFS_V4_1 */



/**
@@ -6737,6 +6827,7 @@ struct rpc_procinfo nfs4_procedures[] = { 
	PROC(LAYOUTCOMMIT,	enc_layoutcommit,	dec_layoutcommit),

	PROC(LAYOUTRETURN,	enc_layoutreturn,	dec_layoutreturn),

	PROC(SECINFO_NO_NAME,	enc_secinfo_no_name,	dec_secinfo_no_name),

	PROC(TEST_STATEID,	enc_test_stateid,	dec_test_stateid),

#endif /* CONFIG_NFS_V4_1 */

};

include/linux/nfs4.h

+1 −0
Original line number Diff line number Diff line
@@ -564,6 +564,7 @@ enum { 
	NFSPROC4_CLNT_LAYOUTCOMMIT,

	NFSPROC4_CLNT_LAYOUTRETURN,

	NFSPROC4_CLNT_SECINFO_NO_NAME,

	NFSPROC4_CLNT_TEST_STATEID,

};



/* nfs41 types */

include/linux/nfs_xdr.h

+10 −0
Original line number Diff line number Diff line
@@ -1092,6 +1092,16 @@ struct nfs41_secinfo_no_name_args { 
	struct nfs4_sequence_args	seq_args;

};



struct nfs41_test_stateid_args {

	nfs4_stateid			*stateid;

	struct nfs4_sequence_args	seq_args;

};



struct nfs41_test_stateid_res {

	unsigned int			status;

	struct nfs4_sequence_res	seq_res;

};



#endif /* CONFIG_NFS_V4_1 */



struct nfs_page;