Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

nfsd4: rename callback struct to cb_conn

Browse source 
I want to use the name for a struct that actually does represent a
single callback.

(Actually, I've never been sure it helps to a separate struct for the
callback information.  Some day maybe those fields could just be dumped
into struct nfs4_client.  I don't know.)

Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
This commit is contained in:
J. Bruce Fields 2009-04-29 19:09:19 -04:00
parent e300a63ce4
commit c237dc0303
3 changed files with 21 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
fs/nfsd/nfs4callback.c
View file

@ -369,7 +369,7 @@ static int max_cb_time(void)
int setup_callback_client(struct nfs4_client *clp) int setup_callback_client(struct nfs4_client *clp)
{ {
struct sockaddr_in addr; struct sockaddr_in addr;
struct nfs4_callback *cb = &clp->cl_callback; struct nfs4_cb_conn *cb = &clp->cl_cb_conn;
struct rpc_timeout timeparms = { struct rpc_timeout timeparms = {
.to_initval = max_cb_time(), .to_initval = max_cb_time(),
.to_retries = 0, .to_retries = 0,
@ -422,7 +422,7 @@ static void nfsd4_cb_probe_done(struct rpc_task *task, void *calldata)
if (task->tk_status) if (task->tk_status)
warn_no_callback_path(clp, task->tk_status); warn_no_callback_path(clp, task->tk_status);
else else
atomic_set(&clp->cl_callback.cb_set, 1); atomic_set(&clp->cl_cb_conn.cb_set, 1);
put_nfs4_client(clp); put_nfs4_client(clp);
} }
@ -430,7 +430,7 @@ static const struct rpc_call_ops nfsd4_cb_probe_ops = {
.rpc_call_done = nfsd4_cb_probe_done, .rpc_call_done = nfsd4_cb_probe_done,
}; };
static struct rpc_cred *lookup_cb_cred(struct nfs4_callback *cb) static struct rpc_cred *lookup_cb_cred(struct nfs4_cb_conn *cb)
{ {
struct auth_cred acred = { struct auth_cred acred = {
.machine_cred = 1 .machine_cred = 1
@ -448,7 +448,7 @@ static struct rpc_cred *lookup_cb_cred(struct nfs4_callback *cb)
void do_probe_callback(struct nfs4_client *clp) void do_probe_callback(struct nfs4_client *clp)
{ {
struct nfs4_callback *cb = &clp->cl_callback; struct nfs4_cb_conn *cb = &clp->cl_cb_conn;
struct rpc_message msg = { struct rpc_message msg = {
.rpc_proc = &nfs4_cb_procedures[NFSPROC4_CLNT_CB_NULL], .rpc_proc = &nfs4_cb_procedures[NFSPROC4_CLNT_CB_NULL],
.rpc_argp = clp, .rpc_argp = clp,
@ -480,7 +480,7 @@ nfsd4_probe_callback(struct nfs4_client *clp)
{ {
int status; int status;
BUG_ON(atomic_read(&clp->cl_callback.cb_set)); BUG_ON(atomic_read(&clp->cl_cb_conn.cb_set));
status = setup_callback_client(clp); status = setup_callback_client(clp);
if (status) { if (status) {
@ -501,12 +501,12 @@ void
nfsd4_cb_recall(struct nfs4_delegation *dp) nfsd4_cb_recall(struct nfs4_delegation *dp)
{ {
struct nfs4_client *clp = dp->dl_client; struct nfs4_client *clp = dp->dl_client;
struct rpc_clnt *clnt = clp->cl_callback.cb_client; struct rpc_clnt *clnt = clp->cl_cb_conn.cb_client;
struct nfs4_cb_recall *cbr = &dp->dl_recall; struct nfs4_cb_recall *cbr = &dp->dl_recall;
struct rpc_message msg = { struct rpc_message msg = {
.rpc_proc = &nfs4_cb_procedures[NFSPROC4_CLNT_CB_RECALL], .rpc_proc = &nfs4_cb_procedures[NFSPROC4_CLNT_CB_RECALL],
.rpc_argp = cbr, .rpc_argp = cbr,
.rpc_cred = clp->cl_callback.cb_cred .rpc_cred = clp->cl_cb_conn.cb_cred
}; };
int retries = 1; int retries = 1;
int status = 0; int status = 0;
@ -519,7 +519,7 @@ nfsd4_cb_recall(struct nfs4_delegation *dp)
switch (status) { switch (status) {
case -EIO: case -EIO:
/* Network partition? */ /* Network partition? */
atomic_set(&clp->cl_callback.cb_set, 0); atomic_set(&clp->cl_cb_conn.cb_set, 0);
case -EBADHANDLE: case -EBADHANDLE:
case -NFS4ERR_BAD_STATEID: case -NFS4ERR_BAD_STATEID:
/* Race: client probably got cb_recall /* Race: client probably got cb_recall

22
fs/nfsd/nfs4state.c
View file

@ -182,7 +182,7 @@ alloc_init_deleg(struct nfs4_client *clp, struct nfs4_stateid *stp, struct svc_f
{ {
struct nfs4_delegation *dp; struct nfs4_delegation *dp;
struct nfs4_file *fp = stp->st_file; struct nfs4_file *fp = stp->st_file;
struct nfs4_callback *cb = &stp->st_stateowner->so_client->cl_callback; struct nfs4_cb_conn *cb = &stp->st_stateowner->so_client->cl_cb_conn;
dprintk("NFSD alloc_init_deleg\n"); dprintk("NFSD alloc_init_deleg\n");
if (fp->fi_had_conflict) if (fp->fi_had_conflict)
@ -633,19 +633,19 @@ static struct nfs4_client *alloc_client(struct xdr_netobj name)
static void static void
shutdown_callback_client(struct nfs4_client *clp) shutdown_callback_client(struct nfs4_client *clp)
{ {
struct rpc_clnt *clnt = clp->cl_callback.cb_client; struct rpc_clnt *clnt = clp->cl_cb_conn.cb_client;
if (clnt) { if (clnt) {
/* /*
* Callback threads take a reference on the client, so there * Callback threads take a reference on the client, so there
* should be no outstanding callbacks at this point. * should be no outstanding callbacks at this point.
*/ */
clp->cl_callback.cb_client = NULL; clp->cl_cb_conn.cb_client = NULL;
rpc_shutdown_client(clnt); rpc_shutdown_client(clnt);
} }
if (clp->cl_callback.cb_cred) { if (clp->cl_cb_conn.cb_cred) {
put_rpccred(clp->cl_callback.cb_cred); put_rpccred(clp->cl_cb_conn.cb_cred);
clp->cl_callback.cb_cred = NULL; clp->cl_cb_conn.cb_cred = NULL;
} }
} }
@ -719,7 +719,7 @@ static struct nfs4_client *create_client(struct xdr_netobj name, char *recdir)
return NULL; return NULL;
memcpy(clp->cl_recdir, recdir, HEXDIR_LEN); memcpy(clp->cl_recdir, recdir, HEXDIR_LEN);
atomic_set(&clp->cl_count, 1); atomic_set(&clp->cl_count, 1);
atomic_set(&clp->cl_callback.cb_set, 0); atomic_set(&clp->cl_cb_conn.cb_set, 0);
INIT_LIST_HEAD(&clp->cl_idhash); INIT_LIST_HEAD(&clp->cl_idhash);
INIT_LIST_HEAD(&clp->cl_strhash); INIT_LIST_HEAD(&clp->cl_strhash);
INIT_LIST_HEAD(&clp->cl_openowners); INIT_LIST_HEAD(&clp->cl_openowners);
@ -971,7 +971,7 @@ parse_ipv4(unsigned int addr_len, char *addr_val, unsigned int *cbaddrp, unsigne
static void static void
gen_callback(struct nfs4_client *clp, struct nfsd4_setclientid *se) gen_callback(struct nfs4_client *clp, struct nfsd4_setclientid *se)
{ {
struct nfs4_callback *cb = &clp->cl_callback; struct nfs4_cb_conn *cb = &clp->cl_cb_conn;
/* Currently, we only support tcp for the callback channel */ /* Currently, we only support tcp for the callback channel */
if ((se->se_callback_netid_len != 3) || memcmp((char *)se->se_callback_netid_val, "tcp", 3)) if ((se->se_callback_netid_len != 3) || memcmp((char *)se->se_callback_netid_val, "tcp", 3))
@ -1691,7 +1691,7 @@ nfsd4_setclientid_confirm(struct svc_rqst *rqstp,
else { else {
/* XXX: We just turn off callbacks until we can handle /* XXX: We just turn off callbacks until we can handle
* change request correctly. */ * change request correctly. */
atomic_set(&conf->cl_callback.cb_set, 0); atomic_set(&conf->cl_cb_conn.cb_set, 0);
expire_client(unconf); expire_client(unconf);
status = nfs_ok; status = nfs_ok;
@ -2425,7 +2425,7 @@ nfs4_open_delegation(struct svc_fh *fh, struct nfsd4_open *open, struct nfs4_sta
{ {
struct nfs4_delegation *dp; struct nfs4_delegation *dp;
struct nfs4_stateowner *sop = stp->st_stateowner; struct nfs4_stateowner *sop = stp->st_stateowner;
struct nfs4_callback *cb = &sop->so_client->cl_callback; struct nfs4_cb_conn *cb = &sop->so_client->cl_cb_conn;
struct file_lock fl, *flp = &fl; struct file_lock fl, *flp = &fl;
int status, flag = 0; int status, flag = 0;
@ -2617,7 +2617,7 @@ nfsd4_renew(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
renew_client(clp); renew_client(clp);
status = nfserr_cb_path_down; status = nfserr_cb_path_down;
if (!list_empty(&clp->cl_delegations) if (!list_empty(&clp->cl_delegations)
&& !atomic_read(&clp->cl_callback.cb_set)) && !atomic_read(&clp->cl_cb_conn.cb_set))
goto out; goto out;
status = nfs_ok; status = nfs_ok;
out: out:

4
include/linux/nfsd/state.h
View file

@ -88,7 +88,7 @@ struct nfs4_delegation {
#define dl_fh dl_recall.cbr_fh #define dl_fh dl_recall.cbr_fh
/* client delegation callback info */ /* client delegation callback info */
struct nfs4_callback { struct nfs4_cb_conn {
/* SETCLIENTID info */ /* SETCLIENTID info */
u32 cb_addr; u32 cb_addr;
unsigned short cb_port; unsigned short cb_port;
@ -186,7 +186,7 @@ struct nfs4_client {
struct svc_cred cl_cred; /* setclientid principal */ struct svc_cred cl_cred; /* setclientid principal */
clientid_t cl_clientid; /* generated by server */ clientid_t cl_clientid; /* generated by server */
nfs4_verifier cl_confirm; /* generated by server */ nfs4_verifier cl_confirm; /* generated by server */
struct nfs4_callback cl_callback; /* callback info */ struct nfs4_cb_conn cl_cb_conn; /* callback info */
atomic_t cl_count; /* ref count */ atomic_t cl_count; /* ref count */
u32 cl_firststate; /* recovery dir creation */ u32 cl_firststate; /* recovery dir creation */