lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests 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
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;
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;
@@ -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));
spin_lock(&clp->cl_lock);
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);
do_probe_callback(clp);
}
/*