Commit 9bc4e3ca authored by Chuck Lever's avatar Chuck Lever Committed by Trond Myklebust
Browse files

NFS: Calldata for nfs4_renew_done() 



I'm about to change task->tk_start from a jiffies value to a ktime_t
value in order to make RPC RTT reporting more precise.

Recently (commit dc96aef9) nfs4_renew_done() started to reference
task->tk_start so that a jiffies value no longer had to be passed
from nfs4_proc_async_renew().  This allowed the calldata to point to
an nfs_client instead.

Changing task->tk_start to a ktime_t value makes it effectively
useless for renew timestamps, so we need to restore the pre-dc96aef9
logic that provided a jiffies "start" timestamp to nfs4_renew_done().

Both an nfs_client pointer and a timestamp need to be passed to
nfs4_renew_done(), so create a new nfs_renewdata structure that
contains both, resembling what is already done for delegreturn,
lock, and unlock.

Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent dfe52c04

fs/nfs/nfs4proc.c

+20 −6
Original line number Original line Diff line number Diff line
@@ -3163,23 +3163,31 @@ static void nfs4_proc_commit_setup(struct nfs_write_data *data, struct rpc_messa 
	msg->rpc_proc = &nfs4_procedures[NFSPROC4_CLNT_COMMIT];

	msg->rpc_proc = &nfs4_procedures[NFSPROC4_CLNT_COMMIT];

}

}





struct nfs4_renewdata {

	struct nfs_client	*client;

	unsigned long		timestamp;

};



/*

/*

 * nfs4_proc_async_renew(): This is not one of the nfs_rpc_ops; it is a special

 * nfs4_proc_async_renew(): This is not one of the nfs_rpc_ops; it is a special

 * standalone procedure for queueing an asynchronous RENEW.

 * standalone procedure for queueing an asynchronous RENEW.

 */

 */

static void nfs4_renew_release(void *data)

static void nfs4_renew_release(void *calldata)

{

{

	struct nfs_client *clp = data;

	struct nfs4_renewdata *data = calldata;

	struct nfs_client *clp = data->client;





	if (atomic_read(&clp->cl_count) > 1)

	if (atomic_read(&clp->cl_count) > 1)

		nfs4_schedule_state_renewal(clp);

		nfs4_schedule_state_renewal(clp);

	nfs_put_client(clp);

	nfs_put_client(clp);

	kfree(data);

}

}





static void nfs4_renew_done(struct rpc_task *task, void *data)

static void nfs4_renew_done(struct rpc_task *task, void *calldata)

{

{

	struct nfs_client *clp = data;

	struct nfs4_renewdata *data = calldata;

	unsigned long timestamp = task->tk_start;

	struct nfs_client *clp = data->client;

	unsigned long timestamp = data->timestamp;





	if (task->tk_status < 0) {

	if (task->tk_status < 0) {

		/* Unless we're shutting down, schedule state recovery! */

		/* Unless we're shutting down, schedule state recovery! */
@@ -3205,11 +3213,17 @@ int nfs4_proc_async_renew(struct nfs_client *clp, struct rpc_cred *cred) 
		.rpc_argp	= clp,

		.rpc_argp	= clp,

		.rpc_cred	= cred,

		.rpc_cred	= cred,

	};

	};

	struct nfs4_renewdata *data;





	if (!atomic_inc_not_zero(&clp->cl_count))

	if (!atomic_inc_not_zero(&clp->cl_count))

		return -EIO;

		return -EIO;

	data = kmalloc(sizeof(*data), GFP_KERNEL);

	if (data == NULL)

		return -ENOMEM;

	data->client = clp;

	data->timestamp = jiffies;

	return rpc_call_async(clp->cl_rpcclient, &msg, RPC_TASK_SOFT,

	return rpc_call_async(clp->cl_rpcclient, &msg, RPC_TASK_SOFT,

			&nfs4_renew_ops, clp);

			&nfs4_renew_ops, data);

}

}





int nfs4_proc_renew(struct nfs_client *clp, struct rpc_cred *cred)

int nfs4_proc_renew(struct nfs_client *clp, struct rpc_cred *cred)

CRA Git | Maintained and supported by SUSTech CRA and CCSE