Commit b029bc9b authored by Fred Isaman's avatar Fred Isaman Committed by Trond Myklebust
Browse files

NFSv4.1: add callback to nfs4_write_done 



Add callback that pnfs layout driver can use to do its own handling
of data server WRITE response.

Signed-off-by: default avatarFred Isaman <iisaman@netapp.com>
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent d138d5d1

fs/nfs/nfs4proc.c

+10 −4
Original line number Diff line number Diff line
@@ -3123,13 +3123,10 @@ void nfs4_reset_read(struct rpc_task *task, struct nfs_read_data *data) 
}

EXPORT_SYMBOL_GPL(nfs4_reset_read);



static int nfs4_write_done(struct rpc_task *task, struct nfs_write_data *data)

static int nfs4_write_done_cb(struct rpc_task *task, struct nfs_write_data *data)

{

	struct inode *inode = data->inode;

	

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

		return -EAGAIN;



	if (nfs4_async_handle_error(task, NFS_SERVER(inode), data->args.context->state) == -EAGAIN) {

		nfs_restart_rpc(task, NFS_SERVER(inode)->nfs_client);

		return -EAGAIN;
@@ -3141,11 +3138,20 @@ static int nfs4_write_done(struct rpc_task *task, struct nfs_write_data *data) 
	return 0;

}



static int nfs4_write_done(struct rpc_task *task, struct nfs_write_data *data)

{

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

		return -EAGAIN;

	return data->write_done_cb(task, data);

}



static void nfs4_proc_write_setup(struct nfs_write_data *data, struct rpc_message *msg)

{

	struct nfs_server *server = NFS_SERVER(data->inode);



	data->args.bitmask = server->cache_consistency_bitmask;

	if (!data->write_done_cb)

		data->write_done_cb = nfs4_write_done_cb;

	data->res.server = server;

	data->timestamp   = jiffies;

include/linux/nfs_xdr.h

+1 −0
Original line number Diff line number Diff line
@@ -1038,6 +1038,7 @@ struct nfs_write_data { 
	unsigned int		npages;		/* Max length of pagevec */

	struct nfs_writeargs	args;		/* argument struct */

	struct nfs_writeres	res;		/* result struct */

	int (*write_done_cb) (struct rpc_task *task, struct nfs_write_data *data);

#ifdef CONFIG_NFS_V4

	unsigned long		timestamp;	/* For lease renewal */

#endif