Commit 57725155 authored by J. Bruce Fields's avatar J. Bruce Fields
Browse files

nfsd4: common helper to initialize callback work 



I've found it confusing having the only references to
nfsd4_do_callback_rpc() in a different file.

Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
parent cb73a9f4

fs/nfsd/nfs4callback.c

+6 −1
Original line number Diff line number Diff line
@@ -1016,7 +1016,7 @@ static void nfsd4_process_cb_update(struct nfsd4_callback *cb) 
		run_nfsd4_cb(cb);

}



void nfsd4_do_callback_rpc(struct work_struct *w)

static void nfsd4_do_callback_rpc(struct work_struct *w)

{

	struct nfsd4_callback *cb = container_of(w, struct nfsd4_callback, cb_work);

	struct nfs4_client *clp = cb->cb_clp;
@@ -1036,6 +1036,11 @@ void nfsd4_do_callback_rpc(struct work_struct *w) 
			cb->cb_ops, cb);

}



void nfsd4_init_callback(struct nfsd4_callback *cb)

{

	INIT_WORK(&cb->cb_work, nfsd4_do_callback_rpc);

}



void nfsd4_cb_recall(struct nfs4_delegation *dp)

{

	struct nfsd4_callback *cb = &dp->dl_recall;

fs/nfsd/nfs4state.c

+2 −2
Original line number Diff line number Diff line
@@ -340,7 +340,7 @@ alloc_init_deleg(struct nfs4_client *clp, struct nfs4_ol_stateid *stp, struct sv 
	fh_copy_shallow(&dp->dl_fh, &current_fh->fh_handle);

	dp->dl_time = 0;

	atomic_set(&dp->dl_count, 1);

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

	nfsd4_init_callback(&dp->dl_recall);

	return dp;

}
@@ -1313,7 +1313,7 @@ static struct nfs4_client *create_client(struct xdr_netobj name, char *recdir, 
	INIT_LIST_HEAD(&clp->cl_lru);

	INIT_LIST_HEAD(&clp->cl_callbacks);

	spin_lock_init(&clp->cl_lock);

	INIT_WORK(&clp->cl_cb_null.cb_work, nfsd4_do_callback_rpc);

	nfsd4_init_callback(&clp->cl_cb_null);

	clp->cl_time = get_seconds();

	clear_bit(0, &clp->cl_cb_slot_busy);

	rpc_init_wait_queue(&clp->cl_cb_waitq, "Backchannel slot table");

fs/nfsd/state.h

+1 −1
Original line number Diff line number Diff line
@@ -470,10 +470,10 @@ extern __be32 nfs4_check_open_reclaim(clientid_t *clid, bool sessions); 
extern void nfs4_free_openowner(struct nfs4_openowner *);

extern void nfs4_free_lockowner(struct nfs4_lockowner *);

extern int set_callback_cred(void);

extern void nfsd4_init_callback(struct nfsd4_callback *);

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_do_callback_rpc(struct work_struct *);

extern void nfsd4_cb_recall(struct nfs4_delegation *dp);

extern int nfsd4_create_callback_queue(void);

extern void nfsd4_destroy_callback_queue(void);