From 511e35c0e9e47d24b01ee1e51a136cd181034a8d Mon Sep 17 00:00:00 2001
From: NeilBrown <neilb@suse.de>
Date: Mon, 10 Apr 2006 22:55:24 -0700
Subject: [PATCH] --- yaml --- r: 25577 b: refs/heads/master c:
 249920527f9e6e5c305538bbf1ea882ee7dc1c06 h: refs/heads/master i:   25575:
 4eaa56915e874be04dd558cdd7407b1cf0d25471 v: v3

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

diff --git a/[refs] b/[refs]
index 31e6c99a6d22..3ac9b309a8d7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e465a77f943f51df1a169426df879340bd0db3f3
+refs/heads/master: 249920527f9e6e5c305538bbf1ea882ee7dc1c06
diff --git a/trunk/fs/nfsd/nfs4acl.c b/trunk/fs/nfsd/nfs4acl.c
index 7391f4aabedb..63818a51c05c 100644
--- a/trunk/fs/nfsd/nfs4acl.c
+++ b/trunk/fs/nfsd/nfs4acl.c
@@ -790,7 +790,7 @@ nfs4_acl_split(struct nfs4_acl *acl, struct nfs4_acl *dacl)
 			continue;
 
 		error = nfs4_acl_add_ace(dacl, ace->type, ace->flag,
-				ace->access_mask, ace->whotype, ace->who) == -1;
+				ace->access_mask, ace->whotype, ace->who);
 		if (error < 0)
 			goto out;