Commit f0b5de1b authored by Christoph Hellwig's avatar Christoph Hellwig Committed by J. Bruce Fields
Browse files

nfsd: split nfsd4_callback initialization and use

Split out initializing the nfs4_callback structure from using it.  For
the NULL callback this gets rid of tons of pointless re-initializations.

Note that I don't quite understand what protects us from running multiple
NULL callbacks at the same time, but at least this chance doesn't make
it worse..
Signed-off-by: default avatarChristoph Hellwig <>
Reviewed-by: default avatarJeff Layton <>
Signed-off-by: default avatarJ. Bruce Fields <>
parent 326129d0
......@@ -743,11 +743,6 @@ static const struct rpc_call_ops nfsd4_cb_probe_ops = {
static struct workqueue_struct *callback_wq;
static void do_probe_callback(struct nfs4_client *clp)
return nfsd4_cb(&clp->cl_cb_null, clp, NFSPROC4_CLNT_CB_NULL);
* Poke the callback thread to process any updates to the callback
* parameters, and send a null probe.
......@@ -756,7 +751,7 @@ void nfsd4_probe_callback(struct nfs4_client *clp)
clp->cl_cb_state = NFSD4_CB_UNKNOWN;
set_bit(NFSD4_CLIENT_CB_UPDATE, &clp->cl_flags);
void nfsd4_probe_callback_sync(struct nfs4_client *clp)
......@@ -912,7 +907,7 @@ void nfsd4_shutdown_callback(struct nfs4_client *clp)
* instead, nfsd4_run_cb_null() will detect the killed
* client, destroy the rpc client, and stop:
......@@ -1025,7 +1020,7 @@ nfsd4_run_cb_recall(struct work_struct *w)
void nfsd4_cb(struct nfsd4_callback *cb, struct nfs4_client *clp,
void nfsd4_init_cb(struct nfsd4_callback *cb, struct nfs4_client *clp,
enum nfsd4_cb_op op)
cb->cb_clp = clp;
......@@ -1038,6 +1033,9 @@ void nfsd4_cb(struct nfsd4_callback *cb, struct nfs4_client *clp,
cb->cb_ops = &nfsd4_cb_recall_ops;
cb->cb_done = true;
void nfsd4_run_cb(struct nfsd4_callback *cb)
queue_work(callback_wq, &cb->cb_work);
......@@ -645,6 +645,9 @@ alloc_init_deleg(struct nfs4_client *clp, struct svc_fh *current_fh)
dp->dl_type = NFS4_OPEN_DELEGATE_READ;
dp->dl_retries = 1;
nfsd4_init_cb(&dp->dl_recall, dp->dl_stid.sc_client,
INIT_WORK(&dp->dl_recall.cb_work, nfsd4_run_cb_recall);
return dp;
......@@ -1869,6 +1872,7 @@ static struct nfs4_client *create_client(struct xdr_netobj name,
return NULL;
nfsd4_init_cb(&clp->cl_cb_null, clp, NFSPROC4_CLNT_CB_NULL);
INIT_WORK(&clp->cl_cb_null.cb_work, nfsd4_run_cb_null);
clp->cl_time = get_seconds();
clear_bit(0, &clp->cl_cb_slot_busy);
......@@ -3388,9 +3392,7 @@ static void nfsd_break_one_deleg(struct nfs4_delegation *dp)
* it's safe to take a reference.
dp->dl_retries = 1;
nfsd4_cb(&dp->dl_recall, dp->dl_stid.sc_client,
/* Called from break_lease() with i_lock held. */
......@@ -543,8 +543,9 @@ void nfsd4_run_cb_recall(struct work_struct *w);
extern void nfsd4_probe_callback(struct nfs4_client *clp);
extern void nfsd4_probe_callback_sync(struct nfs4_client *clp);
extern void nfsd4_change_callback(struct nfs4_client *clp, struct nfs4_cb_conn *);
extern void nfsd4_cb(struct nfsd4_callback *cb, struct nfs4_client *clp,
extern void nfsd4_init_cb(struct nfsd4_callback *cb, struct nfs4_client *clp,
enum nfsd4_cb_op op);
extern void nfsd4_run_cb(struct nfsd4_callback *cb);
extern int nfsd4_create_callback_queue(void);
extern void nfsd4_destroy_callback_queue(void);
extern void nfsd4_shutdown_callback(struct nfs4_client *);
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment