Merge tag 'xfs-for-linus-3.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[firefly-linux-kernel-4.4.55.git] / fs / nfs / callback.c

diff --git a/fs/nfs/callback.c b/fs/nfs/callback.c
index 54de482143cc0708638e12bde9fbbfbd66d59224..b8fb3a4ef64955789bc4c42f297d33e8a52939cf 100644 (file)
--- 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;
 }