From 0882586c2119022b2a5354e63850b98e3c246cdc Mon Sep 17 00:00:00 2001
From: David Howells <dhowells@redhat.com>
Date: Mon, 5 Jan 2009 17:19:37 +0000
Subject: [PATCH] --- yaml --- r: 127487 b: refs/heads/master c:
 f05ef8db1abe68e3f6fc272efee51bc54ce528c5 h: refs/heads/master i:   127485:
 8bfc0a3968b2176efeb66fd10faaa73e74576a4b   127483:
 535f159dff3aa933408e4ef79535f467cfe10aad   127479:
 688eef0f4d494c698b78e49c37e0397ca8986951   127471:
 ddf46359c2ad0051ed74fa861b68553563212c71   127455:
 793b22ec1888dcbc7c483b56f7d96012ffa1ce90   127423:
 2c11b2a3e6f8c599f281fe245eab65f7352869a1   127359:
 3da4efa3c396747c21ef2c31429e4f8f7fe4bce2   127231:
 9a423d9ad1192d6b82a03819bf4695834d51f463   126975:
 5a5977599e8e4f8e2f284d41f6ae11c492c8faff v: v3

---
 [refs]               | 2 +-
 trunk/fs/nfsd/auth.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

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,