PERFORCE change 148516 for review

[Edward Tomasz Napierala]

http://perforce.freebsd.org/chv.cgi?CH=148516

Change 148516 by trasz at trasz_traszkan on 2008/08/26 13:08:49

	Compilation fix.

Affected files ...

.. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_strip.c#4 edit
.. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/subr_acl_nfs4.c#29 edit

Differences ...

==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_strip.c#4 (text+ko) ====

@@ -40,7 +40,6 @@
 static acl_t
 _nfs4_acl_strip_np(const acl_t aclp, int recalculate_mask)
 {
-	int error;
 	acl_t newacl;
 	mode_t mode;
 
@@ -53,11 +52,7 @@
 	_acl_brand_as(newacl, ACL_BRAND_NFS4);
 
 	acl_nfs4_sync_mode_from_acl(&mode, &(aclp->ats_acl));
-	error = acl_nfs4_sync_acl_from_mode(&(newacl->ats_acl), mode, -1);
-	if (error) {
-		errno = EINVAL;
-		return (NULL);
-	}
+	acl_nfs4_sync_acl_from_mode(&(newacl->ats_acl), mode, -1);
 
 	return (newacl);
 }

==== //depot/projects/soc2008/trasz_nfs4acl/sys/kern/subr_acl_nfs4.c#29 (text+ko) ====

@@ -989,6 +989,7 @@
 	return (1);
 }
 
+#ifdef _KERNEL
 /*
  * This routine is used to determine whether to remove extended attribute
  * that stores ACL contents.
@@ -1021,6 +1022,7 @@
 
 	return (trivial);
 }
+#endif
 
 int
 acl_nfs4_check(const struct acl *aclp, int is_directory)