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

Commit 0efb01b2 authored by Donald Buczek's avatar Donald Buczek Committed by Trond Myklebust
Browse files

nfs4: Make nfs4_proc_get_lease_time available for nfs4.0 



Compile nfs4_proc_get_lease_time, enc_get_lease_time and
dec_get_lease_time for nfs4.0. Use nfs4_sequence_done instead of
nfs41_sequence_done in nfs4_proc_get_lease_time,

Signed-off-by: default avatarDonald Buczek <buczek@molgen.mpg.de>
Signed-off-by: default avatarTrond Myklebust <trond.myklebust@hammerspace.com>
parent 2eaf426d

fs/nfs/nfs4_fs.h

+2 −2
Original line number Diff line number Diff line
@@ -312,12 +312,12 @@ extern int nfs4_set_rw_stateid(nfs4_stateid *stateid, 
		const struct nfs_lock_context *l_ctx,

		fmode_t fmode);



extern int nfs4_proc_get_lease_time(struct nfs_client *clp,

		struct nfs_fsinfo *fsinfo);

#if defined(CONFIG_NFS_V4_1)

extern int nfs41_sequence_done(struct rpc_task *, struct nfs4_sequence_res *);

extern int nfs4_proc_create_session(struct nfs_client *, const struct cred *);

extern int nfs4_proc_destroy_session(struct nfs4_session *, const struct cred *);

extern int nfs4_proc_get_lease_time(struct nfs_client *clp,

		struct nfs_fsinfo *fsinfo);

extern int nfs4_proc_layoutcommit(struct nfs4_layoutcommit_data *data,

				  bool sync);

extern int nfs4_detect_session_trunking(struct nfs_client *clp,

fs/nfs/nfs4proc.c

+5 −1
Original line number Diff line number Diff line
@@ -8255,6 +8255,8 @@ int nfs4_destroy_clientid(struct nfs_client *clp) 
	return ret;

}



#endif /* CONFIG_NFS_V4_1 */



struct nfs4_get_lease_time_data {

	struct nfs4_get_lease_time_args *args;

	struct nfs4_get_lease_time_res *res;
@@ -8287,7 +8289,7 @@ static void nfs4_get_lease_time_done(struct rpc_task *task, void *calldata) 
			(struct nfs4_get_lease_time_data *)calldata;



	dprintk("--> %s\n", __func__);

	if (!nfs41_sequence_done(task, &data->res->lr_seq_res))

	if (!nfs4_sequence_done(task, &data->res->lr_seq_res))

		return;

	switch (task->tk_status) {

	case -NFS4ERR_DELAY:
@@ -8345,6 +8347,8 @@ int nfs4_proc_get_lease_time(struct nfs_client *clp, struct nfs_fsinfo *fsinfo) 
	return status;

}



#ifdef CONFIG_NFS_V4_1



/*

 * Initialize the values to be used by the client in CREATE_SESSION

 * If nfs4_init_session set the fore channel request and response sizes,

fs/nfs/nfs4xdr.c

+11 −1
Original line number Diff line number Diff line
@@ -837,6 +837,7 @@ static int decode_layoutget(struct xdr_stream *xdr, struct rpc_rqst *req, 
#define NFS4_dec_sequence_sz \

				(compound_decode_hdr_maxsz + \

				 decode_sequence_maxsz)

#endif

#define NFS4_enc_get_lease_time_sz	(compound_encode_hdr_maxsz + \

					 encode_sequence_maxsz + \

					 encode_putrootfh_maxsz + \
@@ -845,6 +846,7 @@ static int decode_layoutget(struct xdr_stream *xdr, struct rpc_rqst *req, 
					 decode_sequence_maxsz + \

					 decode_putrootfh_maxsz + \

					 decode_fsinfo_maxsz)

#if defined(CONFIG_NFS_V4_1)

#define NFS4_enc_reclaim_complete_sz	(compound_encode_hdr_maxsz + \

					 encode_sequence_maxsz + \

					 encode_reclaim_complete_maxsz)
@@ -2957,6 +2959,8 @@ static void nfs4_xdr_enc_sequence(struct rpc_rqst *req, struct xdr_stream *xdr, 
	encode_nops(&hdr);

}



#endif



/*

 * a GET_LEASE_TIME request

 */
@@ -2977,6 +2981,8 @@ static void nfs4_xdr_enc_get_lease_time(struct rpc_rqst *req, 
	encode_nops(&hdr);

}



#ifdef CONFIG_NFS_V4_1



/*

 * a RECLAIM_COMPLETE request

 */
@@ -7122,6 +7128,8 @@ static int nfs4_xdr_dec_sequence(struct rpc_rqst *rqstp, 
	return status;

}



#endif



/*

 * Decode GET_LEASE_TIME response

 */
@@ -7143,6 +7151,8 @@ static int nfs4_xdr_dec_get_lease_time(struct rpc_rqst *rqstp, 
	return status;

}



#ifdef CONFIG_NFS_V4_1



/*

 * Decode RECLAIM_COMPLETE response

 */
@@ -7551,7 +7561,7 @@ const struct rpc_procinfo nfs4_procedures[] = { 
	PROC41(CREATE_SESSION,	enc_create_session,	dec_create_session),

	PROC41(DESTROY_SESSION,	enc_destroy_session,	dec_destroy_session),

	PROC41(SEQUENCE,	enc_sequence,		dec_sequence),

	PROC41(GET_LEASE_TIME,	enc_get_lease_time,	dec_get_lease_time),

	PROC(GET_LEASE_TIME,	enc_get_lease_time,	dec_get_lease_time),

	PROC41(RECLAIM_COMPLETE,enc_reclaim_complete,	dec_reclaim_complete),

	PROC41(GETDEVICEINFO,	enc_getdeviceinfo,	dec_getdeviceinfo),

	PROC41(LAYOUTGET,	enc_layoutget,		dec_layoutget),