diff options
| author |   Trond Myklebust <trond.myklebust@primarydata.com> | 2014-09-02 13:58:57 -0400 |
|---|---|---|
| committer |   J. Bruce Fields <bfields@redhat.com> | 2014-09-02 17:49:17 -0400 |
| commit | d4e89902990e3fae1b8d2ca501d2fa5f0657c053 (patch) | |
| tree | 686e185ebf2a0e6e4dac46fbacf036a54295ec48 /fs/lockd/svc.c | |
| parent | nfsd4: remove labeled NFS warning from config help (diff) | |
| download | linux-dev-d4e89902990e3fae1b8d2ca501d2fa5f0657c053.tar.xz linux-dev-d4e89902990e3fae1b8d2ca501d2fa5f0657c053.zip | |
lockd: Do not start the lockd thread before we've set nlmsvc_rqst->rq_task
This fixes an Oopsable race when starting lockd.
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
Reviewed-by: Jeff Layton <jlayton@primarydata.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'fs/lockd/svc.c')
| -rw-r--r-- | fs/lockd/svc.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/lockd/svc.c b/fs/lockd/svc.c index b416b3355807..09857b48d0c3 100644 --- a/fs/lockd/svc.c +++ b/fs/lockd/svc.c @@ -306,7 +306,7 @@ static int lockd_start_svc(struct svc_serv *serv) svc_sock_update_bufs(serv); serv->sv_maxconn = nlm_max_connections; - nlmsvc_task = kthread_run(lockd, nlmsvc_rqst, "%s", serv->sv_name); + nlmsvc_task = kthread_create(lockd, nlmsvc_rqst, "%s", serv->sv_name); if (IS_ERR(nlmsvc_task)) { error = PTR_ERR(nlmsvc_task); printk(KERN_WARNING @@ -314,6 +314,7 @@ static int lockd_start_svc(struct svc_serv *serv) goto out_task; } nlmsvc_rqst->rq_task = nlmsvc_task; + wake_up_process(nlmsvc_task); dprintk("lockd_up: service started\n"); return 0; |