diff options
author | Jeff Layton <jlayton@primarydata.com> | 2014-07-16 10:31:56 -0400 |
---|---|---|
committer | J. Bruce Fields <bfields@redhat.com> | 2014-07-16 14:18:58 -0400 |
commit | e8051c837bd96ad1eabdd46504363431dc5fddc5 (patch) | |
tree | 584c66429b59927279f7d5d9601fbedb5ede5213 /fs/nfsd/nfs4state.c | |
parent | d5d5c304b13bc3cade13b8a1b5833c8b3a0975f1 (diff) |
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: Jeff Layton <jlayton@primarydata.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'fs/nfsd/nfs4state.c')
-rw-r--r-- | fs/nfsd/nfs4state.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index 225f98c7d00d..56ea4f12803e 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c | |||
@@ -592,7 +592,7 @@ alloc_init_deleg(struct nfs4_client *clp, struct nfs4_ol_stateid *stp, struct sv | |||
592 | fh_copy_shallow(&dp->dl_fh, ¤t_fh->fh_handle); | 592 | fh_copy_shallow(&dp->dl_fh, ¤t_fh->fh_handle); |
593 | dp->dl_time = 0; | 593 | dp->dl_time = 0; |
594 | atomic_set(&dp->dl_count, 1); | 594 | atomic_set(&dp->dl_count, 1); |
595 | nfsd4_init_callback(&dp->dl_recall); | 595 | INIT_WORK(&dp->dl_recall.cb_work, nfsd4_do_callback_rpc); |
596 | return dp; | 596 | return dp; |
597 | } | 597 | } |
598 | 598 | ||
@@ -1677,7 +1677,7 @@ static struct nfs4_client *create_client(struct xdr_netobj name, | |||
1677 | spin_unlock(&nn->client_lock); | 1677 | spin_unlock(&nn->client_lock); |
1678 | return NULL; | 1678 | return NULL; |
1679 | } | 1679 | } |
1680 | nfsd4_init_callback(&clp->cl_cb_null); | 1680 | INIT_WORK(&clp->cl_cb_null.cb_work, nfsd4_do_callback_rpc); |
1681 | clp->cl_time = get_seconds(); | 1681 | clp->cl_time = get_seconds(); |
1682 | clear_bit(0, &clp->cl_cb_slot_busy); | 1682 | clear_bit(0, &clp->cl_cb_slot_busy); |
1683 | copy_verf(clp, verf); | 1683 | copy_verf(clp, verf); |