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

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

NFS: Common versions of sequence helper functions 



NFSv4.0 will have need for this functionality when I add the ability
to block NFSv4.0 traffic before migration recovery.

I'm not really clear on why nfs4_set_sequence_privileged() gets a
generic name, but nfs41_init_sequence() gets a minor
version-specific name.

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

fs/nfs/nfs4proc.c

+34 −45
Original line number Diff line number Diff line
@@ -469,6 +469,21 @@ struct nfs4_call_sync_data { 
	struct nfs4_sequence_res *seq_res;

};



static void nfs4_init_sequence(struct nfs4_sequence_args *args,

			       struct nfs4_sequence_res *res, int cache_reply)

{

	args->sa_slot = NULL;

	args->sa_cache_this = cache_reply;

	args->sa_privileged = 0;



	res->sr_slot = NULL;

}



static void nfs4_set_sequence_privileged(struct nfs4_sequence_args *args)

{

	args->sa_privileged = 1;

}



#if defined(CONFIG_NFS_V4_1)



static void nfs41_sequence_free_slot(struct nfs4_sequence_res *res)
@@ -617,22 +632,6 @@ static int nfs4_sequence_done(struct rpc_task *task, 
	return nfs41_sequence_done(task, res);

}



static void nfs41_init_sequence(struct nfs4_sequence_args *args,

		struct nfs4_sequence_res *res, int cache_reply)

{

	args->sa_slot = NULL;

	args->sa_cache_this = 0;

	args->sa_privileged = 0;

	if (cache_reply)

		args->sa_cache_this = 1;

	res->sr_slot = NULL;

}



static void nfs4_set_sequence_privileged(struct nfs4_sequence_args *args)

{

	args->sa_privileged = 1;

}



int nfs41_setup_sequence(struct nfs4_session *session,

				struct nfs4_sequence_args *args,

				struct nfs4_sequence_res *res,
@@ -773,16 +772,6 @@ static int nfs4_call_sync_sequence(struct rpc_clnt *clnt, 
}



#else

static

void nfs41_init_sequence(struct nfs4_sequence_args *args,

		struct nfs4_sequence_res *res, int cache_reply)

{

}



static void nfs4_set_sequence_privileged(struct nfs4_sequence_args *args)

{

}



static int nfs4_setup_sequence(const struct nfs_server *server,

			       struct nfs4_sequence_args *args,

			       struct nfs4_sequence_res *res,
@@ -817,7 +806,7 @@ int nfs4_call_sync(struct rpc_clnt *clnt, 
		   struct nfs4_sequence_res *res,

		   int cache_reply)

{

	nfs41_init_sequence(args, res, cache_reply);

	nfs4_init_sequence(args, res, cache_reply);

	return server->nfs_client->cl_mvops->call_sync(clnt, server, msg,

						args, res);

}
@@ -1769,7 +1758,7 @@ static int nfs4_run_open_task(struct nfs4_opendata *data, int isrecover) 
	};

	int status;



	nfs41_init_sequence(&o_arg->seq_args, &o_res->seq_res, 1);

	nfs4_init_sequence(&o_arg->seq_args, &o_res->seq_res, 1);

	kref_get(&data->kref);

	data->rpc_done = 0;

	data->rpc_status = 0;
@@ -2547,7 +2536,7 @@ int nfs4_do_close(struct nfs4_state *state, gfp_t gfp_mask, int wait) 
	calldata = kzalloc(sizeof(*calldata), gfp_mask);

	if (calldata == NULL)

		goto out;

	nfs41_init_sequence(&calldata->arg.seq_args, &calldata->res.seq_res, 1);

	nfs4_init_sequence(&calldata->arg.seq_args, &calldata->res.seq_res, 1);

	calldata->inode = state->inode;

	calldata->state = state;

	calldata->arg.fh = NFS_FH(state->inode);
@@ -3312,7 +3301,7 @@ static void nfs4_proc_unlink_setup(struct rpc_message *msg, struct inode *dir) 


	res->server = server;

	msg->rpc_proc = &nfs4_procedures[NFSPROC4_CLNT_REMOVE];

	nfs41_init_sequence(&args->seq_args, &res->seq_res, 1);

	nfs4_init_sequence(&args->seq_args, &res->seq_res, 1);



	nfs_fattr_init(res->dir_attr);

}
@@ -3346,7 +3335,7 @@ static void nfs4_proc_rename_setup(struct rpc_message *msg, struct inode *dir) 


	msg->rpc_proc = &nfs4_procedures[NFSPROC4_CLNT_RENAME];

	res->server = server;

	nfs41_init_sequence(&arg->seq_args, &res->seq_res, 1);

	nfs4_init_sequence(&arg->seq_args, &res->seq_res, 1);

}



static void nfs4_proc_rename_rpc_prepare(struct rpc_task *task, struct nfs_renamedata *data)
@@ -3954,7 +3943,7 @@ static void nfs4_proc_read_setup(struct nfs_read_data *data, struct rpc_message 
	data->timestamp   = jiffies;

	data->read_done_cb = nfs4_read_done_cb;

	msg->rpc_proc = &nfs4_procedures[NFSPROC4_CLNT_READ];

	nfs41_init_sequence(&data->args.seq_args, &data->res.seq_res, 0);

	nfs4_init_sequence(&data->args.seq_args, &data->res.seq_res, 0);

}



static void nfs4_proc_read_rpc_prepare(struct rpc_task *task, struct nfs_read_data *data)
@@ -4038,7 +4027,7 @@ static void nfs4_proc_write_setup(struct nfs_write_data *data, struct rpc_messag 
	data->timestamp   = jiffies;



	msg->rpc_proc = &nfs4_procedures[NFSPROC4_CLNT_WRITE];

	nfs41_init_sequence(&data->args.seq_args, &data->res.seq_res, 1);

	nfs4_init_sequence(&data->args.seq_args, &data->res.seq_res, 1);

}



static void nfs4_proc_write_rpc_prepare(struct rpc_task *task, struct nfs_write_data *data)
@@ -4087,7 +4076,7 @@ static void nfs4_proc_commit_setup(struct nfs_commit_data *data, struct rpc_mess 
		data->commit_done_cb = nfs4_commit_done_cb;

	data->res.server = server;

	msg->rpc_proc = &nfs4_procedures[NFSPROC4_CLNT_COMMIT];

	nfs41_init_sequence(&data->args.seq_args, &data->res.seq_res, 1);

	nfs4_init_sequence(&data->args.seq_args, &data->res.seq_res, 1);

}



struct nfs4_renewdata {
@@ -4901,7 +4890,7 @@ static int _nfs4_proc_delegreturn(struct inode *inode, struct rpc_cred *cred, co 
	data = kzalloc(sizeof(*data), GFP_NOFS);

	if (data == NULL)

		return -ENOMEM;

	nfs41_init_sequence(&data->args.seq_args, &data->res.seq_res, 1);

	nfs4_init_sequence(&data->args.seq_args, &data->res.seq_res, 1);

	data->args.fhandle = &data->fh;

	data->args.stateid = &data->stateid;

	data->args.bitmask = server->cache_consistency_bitmask;
@@ -5166,7 +5155,7 @@ static struct rpc_task *nfs4_do_unlck(struct file_lock *fl, 
		return ERR_PTR(-ENOMEM);

	}



	nfs41_init_sequence(&data->arg.seq_args, &data->res.seq_res, 1);

	nfs4_init_sequence(&data->arg.seq_args, &data->res.seq_res, 1);

	msg.rpc_argp = &data->arg;

	msg.rpc_resp = &data->res;

	task_setup_data.callback_data = data;
@@ -5402,7 +5391,7 @@ static int _nfs4_do_setlk(struct nfs4_state *state, int cmd, struct file_lock *f 
		return -ENOMEM;

	if (IS_SETLKW(cmd))

		data->arg.block = 1;

	nfs41_init_sequence(&data->arg.seq_args, &data->res.seq_res, 1);

	nfs4_init_sequence(&data->arg.seq_args, &data->res.seq_res, 1);

	msg.rpc_argp = &data->arg;

	msg.rpc_resp = &data->res;

	task_setup_data.callback_data = data;
@@ -6266,7 +6255,7 @@ int nfs4_proc_get_lease_time(struct nfs_client *clp, struct nfs_fsinfo *fsinfo) 
	};

	int status;



	nfs41_init_sequence(&args.la_seq_args, &res.lr_seq_res, 0);

	nfs4_init_sequence(&args.la_seq_args, &res.lr_seq_res, 0);

	nfs4_set_sequence_privileged(&args.la_seq_args);

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

	task = rpc_run_task(&task_setup);
@@ -6572,7 +6561,7 @@ static struct rpc_task *_nfs41_proc_sequence(struct nfs_client *clp, 
		nfs_put_client(clp);

		return ERR_PTR(-ENOMEM);

	}

	nfs41_init_sequence(&calldata->args, &calldata->res, 0);

	nfs4_init_sequence(&calldata->args, &calldata->res, 0);

	if (is_privileged)

		nfs4_set_sequence_privileged(&calldata->args);

	msg.rpc_argp = &calldata->args;
@@ -6715,7 +6704,7 @@ static int nfs41_proc_reclaim_complete(struct nfs_client *clp, 
	calldata->clp = clp;

	calldata->arg.one_fs = 0;



	nfs41_init_sequence(&calldata->arg.seq_args, &calldata->res.seq_res, 0);

	nfs4_init_sequence(&calldata->arg.seq_args, &calldata->res.seq_res, 0);

	nfs4_set_sequence_privileged(&calldata->arg.seq_args);

	msg.rpc_argp = &calldata->arg;

	msg.rpc_resp = &calldata->res;
@@ -6906,7 +6895,7 @@ nfs4_proc_layoutget(struct nfs4_layoutget *lgp, gfp_t gfp_flags) 


	lgp->res.layoutp = &lgp->args.layout;

	lgp->res.seq_res.sr_slot = NULL;

	nfs41_init_sequence(&lgp->args.seq_args, &lgp->res.seq_res, 0);

	nfs4_init_sequence(&lgp->args.seq_args, &lgp->res.seq_res, 0);



	/* nfs4_layoutget_release calls pnfs_put_layout_hdr */

	pnfs_get_layout_hdr(NFS_I(inode)->layout);
@@ -7001,7 +6990,7 @@ int nfs4_proc_layoutreturn(struct nfs4_layoutreturn *lrp) 
	int status;



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

	nfs41_init_sequence(&lrp->args.seq_args, &lrp->res.seq_res, 1);

	nfs4_init_sequence(&lrp->args.seq_args, &lrp->res.seq_res, 1);

	task = rpc_run_task(&task_setup_data);

	if (IS_ERR(task))

		return PTR_ERR(task);
@@ -7183,7 +7172,7 @@ nfs4_proc_layoutcommit(struct nfs4_layoutcommit_data *data, bool sync) 
		data->args.lastbytewritten,

		data->args.inode->i_ino);



	nfs41_init_sequence(&data->args.seq_args, &data->res.seq_res, 1);

	nfs4_init_sequence(&data->args.seq_args, &data->res.seq_res, 1);

	task = rpc_run_task(&task_setup_data);

	if (IS_ERR(task))

		return PTR_ERR(task);
@@ -7302,7 +7291,7 @@ static int _nfs41_test_stateid(struct nfs_server *server, 
	};



	dprintk("NFS call  test_stateid %p\n", stateid);

	nfs41_init_sequence(&args.seq_args, &res.seq_res, 0);

	nfs4_init_sequence(&args.seq_args, &res.seq_res, 0);

	nfs4_set_sequence_privileged(&args.seq_args);

	status = nfs4_call_sync_sequence(server->client, server, &msg,

			&args.seq_args, &res.seq_res);
@@ -7407,7 +7396,7 @@ static struct rpc_task *_nfs41_free_stateid(struct nfs_server *server, 


	msg.rpc_argp = &data->args;

	msg.rpc_resp = &data->res;

	nfs41_init_sequence(&data->args.seq_args, &data->res.seq_res, 0);

	nfs4_init_sequence(&data->args.seq_args, &data->res.seq_res, 0);

	if (privileged)

		nfs4_set_sequence_privileged(&data->args.seq_args);