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

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 <hch@lst.de>
Reviewed-by: default avatarJeff Layton <jlayton@primarydata.com>
Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
parent 326129d0

fs/nfsd/nfs4callback.c

+6 −8
Original line number Diff line number Diff line
@@ -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);

	do_probe_callback(clp);

	nfsd4_run_cb(&clp->cl_cb_null);

}



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:

	 */

	do_probe_callback(clp);

	nfsd4_run_cb(&clp->cl_cb_null);

	flush_workqueue(callback_wq);

}
@@ -1025,7 +1020,7 @@ nfsd4_run_cb_recall(struct work_struct *w) 
	nfsd4_run_callback_rpc(cb);

}



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;

	INIT_LIST_HEAD(&cb->cb_per_client);

	cb->cb_done = true;

}



void nfsd4_run_cb(struct nfsd4_callback *cb)

{

	queue_work(callback_wq, &cb->cb_work);

}

fs/nfsd/nfs4state.c

+5 −3
Original line number Diff line number Diff line
@@ -645,6 +645,9 @@ alloc_init_deleg(struct nfs4_client *clp, struct svc_fh *current_fh) 
	INIT_LIST_HEAD(&dp->dl_perclnt);

	INIT_LIST_HEAD(&dp->dl_recall_lru);

	dp->dl_type = NFS4_OPEN_DELEGATE_READ;

	dp->dl_retries = 1;

	nfsd4_init_cb(&dp->dl_recall, dp->dl_stid.sc_client,

		 NFSPROC4_CLNT_CB_RECALL);

	INIT_WORK(&dp->dl_recall.cb_work, nfsd4_run_cb_recall);

	return dp;

out_dec:
@@ -1869,6 +1872,7 @@ static struct nfs4_client *create_client(struct xdr_netobj name, 
		free_client(clp);

		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.

	 */

	atomic_inc(&dp->dl_stid.sc_count);

	dp->dl_retries = 1;

	nfsd4_cb(&dp->dl_recall, dp->dl_stid.sc_client,

		 NFSPROC4_CLNT_CB_RECALL);

	nfsd4_run_cb(&dp->dl_recall);

}



/* Called from break_lease() with i_lock held. */

fs/nfsd/state.h

+2 −1
Original line number Diff line number Diff line
@@ -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 *);