diff options
author | J. Bruce Fields <bfields@redhat.com> | 2012-11-05 15:10:26 -0500 |
---|---|---|
committer | J. Bruce Fields <bfields@redhat.com> | 2012-11-07 19:40:04 -0500 |
commit | 57725155dc1b8c78b7a96886d5cdc69dc89e9c54 (patch) | |
tree | 41f86cc189fe5a04b661e3fa8fab415d52569175 /fs/nfsd/nfs4state.c | |
parent | cb73a9f4649bf63c0397e565a15abf8a91ecf56f (diff) |
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: 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 4023e77687ee..13f3471b02a2 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c | |||
@@ -340,7 +340,7 @@ alloc_init_deleg(struct nfs4_client *clp, struct nfs4_ol_stateid *stp, struct sv | |||
340 | fh_copy_shallow(&dp->dl_fh, ¤t_fh->fh_handle); | 340 | fh_copy_shallow(&dp->dl_fh, ¤t_fh->fh_handle); |
341 | dp->dl_time = 0; | 341 | dp->dl_time = 0; |
342 | atomic_set(&dp->dl_count, 1); | 342 | atomic_set(&dp->dl_count, 1); |
343 | INIT_WORK(&dp->dl_recall.cb_work, nfsd4_do_callback_rpc); | 343 | nfsd4_init_callback(&dp->dl_recall); |
344 | return dp; | 344 | return dp; |
345 | } | 345 | } |
346 | 346 | ||
@@ -1313,7 +1313,7 @@ static struct nfs4_client *create_client(struct xdr_netobj name, char *recdir, | |||
1313 | INIT_LIST_HEAD(&clp->cl_lru); | 1313 | INIT_LIST_HEAD(&clp->cl_lru); |
1314 | INIT_LIST_HEAD(&clp->cl_callbacks); | 1314 | INIT_LIST_HEAD(&clp->cl_callbacks); |
1315 | spin_lock_init(&clp->cl_lock); | 1315 | spin_lock_init(&clp->cl_lock); |
1316 | INIT_WORK(&clp->cl_cb_null.cb_work, nfsd4_do_callback_rpc); | 1316 | nfsd4_init_callback(&clp->cl_cb_null); |
1317 | clp->cl_time = get_seconds(); | 1317 | clp->cl_time = get_seconds(); |
1318 | clear_bit(0, &clp->cl_cb_slot_busy); | 1318 | clear_bit(0, &clp->cl_cb_slot_busy); |
1319 | rpc_init_wait_queue(&clp->cl_cb_waitq, "Backchannel slot table"); | 1319 | rpc_init_wait_queue(&clp->cl_cb_waitq, "Backchannel slot table"); |