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

Commit 472cfbd9 authored by Andy Adamson's avatar Andy Adamson Committed by Benny Halevy
Browse files

nfs41: unlink sequence setup/done support 



Implement the rpc_call_prepare methods for
asynchronuos nfs rpcs, call nfs41_setup_sequence from
respective rpc_call_validate_args methods.

Call nfs4_sequence_done from respective rpc_call_done methods.

Note that we need to pass a pointer to the nfs_server in calls data
for passing on to nfs4_sequence_done.

Signed-off-by: default avatarAndy <Adamson&lt;andros@netapp.com>
Signed-off-by: default avatarBenny Halevy <bhalevy@panasas.com>
[pnfs: client data server write validate and release]
Signed-off-by: default avatarAndy <Adamson&lt;andros@umich.edu>
Signed-off-by: default avatarBenny Halevy <bhalevy@panasas.com>
[nfs41: separate free slot from sequence done]
[nfs41: sequence res use slotid]
[nfs41: remove SEQ4_STATUS_USE_TK_STATUS]
[nfs41: nfs4_sequence_free_slot use nfs_client for data server]
Signed-off-by: default avatarAndy Adamson <andros@netapp.com>
Signed-off-by: default avatarBenny Halevy <bhalevy@panasas.com>
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent a893693c

fs/nfs/nfs4proc.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -2424,8 +2424,10 @@ static int nfs4_proc_unlink_done(struct rpc_task *task, struct inode *dir) 
{

{

	struct nfs_removeres *res = task->tk_msg.rpc_resp;

	struct nfs_removeres *res = task->tk_msg.rpc_resp;





	nfs4_sequence_done(res->server, &res->seq_res, task->tk_status);

	if (nfs4_async_handle_error(task, res->server, NULL) == -EAGAIN)

	if (nfs4_async_handle_error(task, res->server, NULL) == -EAGAIN)

		return 0;

		return 0;

	nfs4_sequence_free_slot(res->server->nfs_client, &res->seq_res);

	update_changeattr(dir, &res->cinfo);

	update_changeattr(dir, &res->cinfo);

	nfs_post_op_update_inode(dir, &res->dir_attr);

	nfs_post_op_update_inode(dir, &res->dir_attr);

	return 1;

	return 1;

fs/nfs/unlink.c

+17 −0
Original line number Original line Diff line number Diff line
@@ -15,6 +15,7 @@ 
#include <linux/wait.h>

#include <linux/wait.h>





#include "internal.h"

#include "internal.h"

#include "nfs4_fs.h"





struct nfs_unlinkdata {

struct nfs_unlinkdata {

	struct hlist_node list;

	struct hlist_node list;
@@ -102,9 +103,25 @@ static void nfs_async_unlink_release(void *calldata) 
	nfs_sb_deactive(sb);

	nfs_sb_deactive(sb);

}

}





#if defined(CONFIG_NFS_V4_1)

void nfs_unlink_prepare(struct rpc_task *task, void *calldata)

{

	struct nfs_unlinkdata *data = calldata;

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



	if (nfs4_setup_sequence(server->nfs_client, &data->args.seq_args,

				&data->res.seq_res, 1, task))

		return;

	rpc_call_start(task);

}

#endif /* CONFIG_NFS_V4_1 */



static const struct rpc_call_ops nfs_unlink_ops = {

static const struct rpc_call_ops nfs_unlink_ops = {

	.rpc_call_done = nfs_async_unlink_done,

	.rpc_call_done = nfs_async_unlink_done,

	.rpc_release = nfs_async_unlink_release,

	.rpc_release = nfs_async_unlink_release,

#if defined(CONFIG_NFS_V4_1)

	.rpc_call_prepare = nfs_unlink_prepare,

#endif /* CONFIG_NFS_V4_1 */

};

};





static int nfs_do_call_unlink(struct dentry *parent, struct inode *dir, struct nfs_unlinkdata *data)

static int nfs_do_call_unlink(struct dentry *parent, struct inode *dir, struct nfs_unlinkdata *data)