From adc4e82ad284df41599a3c4a2b63b3c0c285c39c Mon Sep 17 00:00:00 2001
From: Trond Myklebust <Trond.Myklebust@netapp.com>
Date: Tue, 16 Oct 2012 12:30:44 -0400
Subject: [PATCH] --- yaml --- r: 334692 b: refs/heads/master c:
 e9b7e91745fa9df94900c8ab08e633f336686098 h: refs/heads/master v: v3

---
 [refs]                  | 2 +-
 trunk/fs/nfs/callback.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index e9057a45d5c8..a78193273cea 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2e928e4878fbc6328c2b1fc897d008db257bfbb0
+refs/heads/master: e9b7e91745fa9df94900c8ab08e633f336686098
diff --git a/trunk/fs/nfs/callback.c b/trunk/fs/nfs/callback.c
index 9a521fb39869..5088b57b078a 100644
--- a/trunk/fs/nfs/callback.c
+++ b/trunk/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;