diff options
| author | Trond Myklebust | 2014-09-30 22:23:39 +0200 |
|---|---|---|
| committer | Trond Myklebust | 2014-09-30 22:23:39 +0200 |
| commit | 4a3a0ebad1360696125bf34d89de55d71c4d0eaa (patch) | |
| tree | 12bc1bb6c8b6121a1ba30423a5b27fb91cba0a39 /fs/nfs | |
| parent | Linux 3.17-rc4 (diff) | |
| parent | NFSD: Implement SEEK (diff) | |
| download | kernel-qcow2-linux-4a3a0ebad1360696125bf34d89de55d71c4d0eaa.tar.gz kernel-qcow2-linux-4a3a0ebad1360696125bf34d89de55d71c4d0eaa.tar.xz kernel-qcow2-linux-4a3a0ebad1360696125bf34d89de55d71c4d0eaa.zip | |
Merge commit '24bab491220f' into client-4.2
- Pull in patch 'NFSD: Implement SEEK' from Bruce's nfsd-next tree
for dependencies.
Diffstat (limited to 'fs/nfs')
| -rw-r--r-- | fs/nfs/callback.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/nfs/callback.c b/fs/nfs/callback.c index 54de482143cc..b8fb3a4ef649 100644 --- a/fs/nfs/callback.c +++ b/fs/nfs/callback.c @@ -235,7 +235,7 @@ static int nfs_callback_start_svc(int minorversion, struct rpc_xprt *xprt, cb_info->serv = serv; cb_info->rqst = rqstp; - cb_info->task = kthread_run(callback_svc, cb_info->rqst, + cb_info->task = kthread_create(callback_svc, cb_info->rqst, "nfsv4.%u-svc", minorversion); if (IS_ERR(cb_info->task)) { ret = PTR_ERR(cb_info->task); @@ -244,6 +244,8 @@ static int nfs_callback_start_svc(int minorversion, struct rpc_xprt *xprt, cb_info->task = NULL; return ret; } + rqstp->rq_task = cb_info->task; + wake_up_process(cb_info->task); dprintk("nfs_callback_up: service started\n"); return 0; } |