Kernel/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-01-15 01:24:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

nfsd4: separate callback change and callback probe

Browse Source 
Only one of the nfsd4_callback_probe callers actually cares about
changing the callback information.

Signed-off-by: J. Bruce Fields <bfields@redhat.com>
This commit is contained in:
J. Bruce Fields 2010-10-19 17:56:52 -04:00
parent 8b5ce5cd44
commit 5a3c9d7134
3 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
fs/nfsd/nfs4callback.c
View File

@ -550,7 +550,7 @@ int set_callback_cred(void)
static struct workqueue_struct *callback_wq; static struct workqueue_struct *callback_wq;
void do_probe_callback(struct nfs4_client *clp) static void do_probe_callback(struct nfs4_client *clp)
{ {
struct nfsd4_callback *cb = &clp->cl_cb_null; struct nfsd4_callback *cb = &clp->cl_cb_null;
@ -568,17 +568,22 @@ void do_probe_callback(struct nfs4_client *clp)
} }
/* /*
* Set up the callback client and put a NFSPROC4_CB_NULL on the wire... * Poke the callback thread to process any updates to the callback
* parameters, and send a null probe.
*/ */
void nfsd4_probe_callback(struct nfs4_client *clp, struct nfs4_cb_conn *conn) void nfsd4_probe_callback(struct nfs4_client *clp)
{
set_bit(NFSD4_CLIENT_CB_UPDATE, &clp->cl_cb_flags);
do_probe_callback(clp);
}
void nfsd4_change_callback(struct nfs4_client *clp, struct nfs4_cb_conn *conn)
{ {
BUG_ON(atomic_read(&clp->cl_cb_set)); BUG_ON(atomic_read(&clp->cl_cb_set));
spin_lock(&clp->cl_lock); spin_lock(&clp->cl_lock);
memcpy(&clp->cl_cb_conn, conn, sizeof(struct nfs4_cb_conn)); memcpy(&clp->cl_cb_conn, conn, sizeof(struct nfs4_cb_conn));
set_bit(NFSD4_CLIENT_CB_UPDATE, &clp->cl_cb_flags);
spin_unlock(&clp->cl_lock); spin_unlock(&clp->cl_lock);
do_probe_callback(clp);
} }
/* /*

7
fs/nfsd/nfs4state.c
View File

@ -783,7 +783,7 @@ static struct nfsd4_session *alloc_init_session(struct svc_rqst *rqstp, struct n
rpc_copy_addr((struct sockaddr *)&clp->cl_cb_conn.cb_addr, sa); rpc_copy_addr((struct sockaddr *)&clp->cl_cb_conn.cb_addr, sa);
clp->cl_cb_conn.cb_addrlen = svc_addr_len(sa); clp->cl_cb_conn.cb_addrlen = svc_addr_len(sa);
clp->cl_cb_conn.cb_minorversion = 1; clp->cl_cb_conn.cb_minorversion = 1;
nfsd4_probe_callback(clp, &clp->cl_cb_conn); nfsd4_probe_callback(clp);
} }
return new; return new;
} }
@ -1912,7 +1912,8 @@ nfsd4_setclientid_confirm(struct svc_rqst *rqstp,
status = nfserr_clid_inuse; status = nfserr_clid_inuse;
else { else {
atomic_set(&conf->cl_cb_set, 0); atomic_set(&conf->cl_cb_set, 0);
nfsd4_probe_callback(conf, &unconf->cl_cb_conn); nfsd4_change_callback(conf, &unconf->cl_cb_conn);
nfsd4_probe_callback(conf);
expire_client(unconf); expire_client(unconf);
status = nfs_ok; status = nfs_ok;
@ -1946,7 +1947,7 @@ nfsd4_setclientid_confirm(struct svc_rqst *rqstp,
} }
move_to_confirmed(unconf); move_to_confirmed(unconf);
conf = unconf; conf = unconf;
nfsd4_probe_callback(conf, &conf->cl_cb_conn); nfsd4_probe_callback(conf);
status = nfs_ok; status = nfs_ok;
} }
} else if ((!conf || (conf && !same_verf(&conf->cl_confirm, &confirm))) } else if ((!conf || (conf && !same_verf(&conf->cl_confirm, &confirm)))

3
fs/nfsd/state.h
View File

@ -453,7 +453,8 @@ extern int nfs4_in_grace(void);
extern __be32 nfs4_check_open_reclaim(clientid_t *clid); extern __be32 nfs4_check_open_reclaim(clientid_t *clid);
extern void nfs4_free_stateowner(struct kref *kref); extern void nfs4_free_stateowner(struct kref *kref);
extern int set_callback_cred(void); extern int set_callback_cred(void);
extern void nfsd4_probe_callback(struct nfs4_client *clp, struct nfs4_cb_conn *); extern void nfsd4_probe_callback(struct nfs4_client *clp);
extern void nfsd4_change_callback(struct nfs4_client *clp, struct nfs4_cb_conn *);
extern void nfsd4_do_callback_rpc(struct work_struct *); extern void nfsd4_do_callback_rpc(struct work_struct *);
extern void nfsd4_cb_recall(struct nfs4_delegation *dp); extern void nfsd4_cb_recall(struct nfs4_delegation *dp);
extern int nfsd4_create_callback_queue(void); extern int nfsd4_create_callback_queue(void);