From f2ed3ece288bd20003cdd3b27134e74d09c2bf34 Mon Sep 17 00:00:00 2001
From: Bryan Schumaker <bjschuma@netapp.com>
Date: Thu, 9 Aug 2012 14:05:50 -0400
Subject: [PATCH] --- yaml --- r: 322111 b: refs/heads/master c:
 12dfd080556124088ed61a292184947711b46cbe h: refs/heads/master i:   322109:
 affd1652d7baed6909ae2fd12fa4147e46db7d90   322107:
 703fb2382162af77e96bb0e952ae2532db55dc20   322103:
 41948f10e92a6643c8026cd2b8b6346337b8a897   322095:
 53181c3fb80a9a74da62fad5d780d8d2288bc564   322079:
 b50968b786b071f6bef5f2dbba905d60e0013334   322047:
 27b0e523df4658ba9565de27ac71978c0533e2b2 v: v3

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

diff --git a/[refs] b/[refs]
index baf0701dde64..69dd41d69391 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c5066945b7ea346a11424dbeb7830b7d7d00c206
+refs/heads/master: 12dfd080556124088ed61a292184947711b46cbe
diff --git a/trunk/fs/nfs/idmap.c b/trunk/fs/nfs/idmap.c
index 6703c73307a5..a850079467d8 100644
--- a/trunk/fs/nfs/idmap.c
+++ b/trunk/fs/nfs/idmap.c
@@ -760,9 +760,8 @@ idmap_pipe_downcall(struct file *filp, const char __user *src, size_t mlen)
 	}
 
 	if (!(im.im_status & IDMAP_STATUS_SUCCESS)) {
-		ret = mlen;
-		complete_request_key(cons, -ENOKEY);
-		goto out_incomplete;
+		ret = -ENOKEY;
+		goto out;
 	}
 
 	namelen_in = strnlen(im.im_name, IDMAP_NAMESZ);
@@ -779,7 +778,6 @@ idmap_pipe_downcall(struct file *filp, const char __user *src, size_t mlen)
 
 out:
 	complete_request_key(cons, ret);
-out_incomplete:
 	return ret;
 }