diff --git a/[refs] b/[refs]
index 722ad87db343..56a88df0335a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 097b180ca09b581ef0dc24fbcfc1b227de3875df
+refs/heads/master: 7f6c7e62fcc123e6bd9206da99a2163fe3facc31
diff --git a/trunk/fs/namei.c b/trunk/fs/namei.c
index f79aef16320b..46ea9cc16647 100644
--- a/trunk/fs/namei.c
+++ b/trunk/fs/namei.c
@@ -2162,7 +2162,7 @@ static struct file *do_last(struct nameidata *nd, struct path *path,
 		/* sayonara */
 		error = complete_walk(nd);
 		if (error)
-			return ERR_PTR(-ECHILD);
+			return ERR_PTR(error);
 
 		error = -ENOTDIR;
 		if (nd->flags & LOOKUP_DIRECTORY) {