diff --git a/[refs] b/[refs]
index 10b02c66f30a..2bf0332d5b1e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0dba7c2a9ed3d4a1e58f5d94fffa9f44dbe012e6
+refs/heads/master: f05ef8db1abe68e3f6fc272efee51bc54ce528c5
diff --git a/trunk/fs/nfsd/auth.c b/trunk/fs/nfsd/auth.c
index 0184fe9b514c..c903e04aa217 100644
--- a/trunk/fs/nfsd/auth.c
+++ b/trunk/fs/nfsd/auth.c
@@ -76,10 +76,10 @@ int nfsd_setuser(struct svc_rqst *rqstp, struct svc_export *exp)
 
 	ret = set_groups(new, gi);
 	put_group_info(gi);
-	if (!ret)
+	if (ret < 0)
 		goto error;
 
-	if (new->uid)
+	if (new->fsuid)
 		new->cap_effective = cap_drop_nfsd_set(new->cap_effective);
 	else
 		new->cap_effective = cap_raise_nfsd_set(new->cap_effective,