From: Trond Myklebust <Trond.Myklebust@netapp.com>
Date: Tue, 16 Oct 2012 16:30:44 +0000 (-0400)
Subject: NFSv4: Fix the return value for nfs_callback_start_svc
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=e9b7e91745fa9df94900c8ab08e633f336686098;p=openwrt%2Fstaging%2Fblogic.git

NFSv4: Fix the return value for nfs_callback_start_svc

returning PTR_ERR(cb_info->task) just after we have set it to
NULL looks like a typo...

Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Cc: Stanislav Kinsbursky <skinsbursky@parallels.com>
---

diff --git a/fs/nfs/callback.c b/fs/nfs/callback.c
index 9a521fb39869..5088b57b078a 100644
--- a/fs/nfs/callback.c
+++ b/fs/nfs/callback.c
@@ -241,7 +241,7 @@ static int nfs_callback_start_svc(int minorversion, struct rpc_xprt *xprt,
 		svc_exit_thread(cb_info->rqst);
 		cb_info->rqst = NULL;
 		cb_info->task = NULL;
-		return PTR_ERR(cb_info->task);
+		return ret;
 	}
 	dprintk("nfs_callback_up: service started\n");
 	return 0;