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

Commit e8051c83 authored by Jeff Layton's avatar Jeff Layton Committed by J. Bruce Fields
Browse files

nfsd: eliminate nfsd4_init_callback 



It's just an obfuscated INIT_WORK call. Just make the work_func_t a
non-static symbol and use a normal INIT_WORK call.

Signed-off-by: default avatarJeff Layton <jlayton@primarydata.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
parent d5d5c304

fs/nfsd/nfs4callback.c

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

}



static void nfsd4_do_callback_rpc(struct work_struct *w)

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;
@@ -1031,11 +1032,6 @@ static 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
@@ -592,7 +592,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);

	nfsd4_init_callback(&dp->dl_recall);

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

	return dp;

}
@@ -1677,7 +1677,7 @@ static struct nfs4_client *create_client(struct xdr_netobj name, 
		spin_unlock(&nn->client_lock);

		return NULL;

	}

	nfsd4_init_callback(&clp->cl_cb_null);

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

	clp->cl_time = get_seconds();

	clear_bit(0, &clp->cl_cb_slot_busy);

	copy_verf(clp, verf);

fs/nfsd/state.h

+1 −1
Original line number Diff line number Diff line
@@ -436,7 +436,7 @@ extern struct nfs4_client_reclaim *nfsd4_find_reclaim_client(const char *recdir, 
extern __be32 nfs4_check_open_reclaim(clientid_t *clid,

		struct nfsd4_compound_state *cstate, struct nfsd_net *nn);

extern int set_callback_cred(void);

extern void nfsd4_init_callback(struct nfsd4_callback *);

void nfsd4_do_callback_rpc(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 *);