svn commit: r235889 - stable/9/sys/kern
Edward Tomasz Napierala
trasz at FreeBSD.org
Thu May 24 09:59:59 UTC 2012
Author: trasz
Date: Thu May 24 09:59:58 2012
New Revision: 235889
URL: http://svn.freebsd.org/changeset/base/235889
Log:
MFC r226043:
Remove assertion against empty NFSv4 ACLs. An empty ACL is not exactly
valid - we don't allow for setting it on a file, for example - but it's
not something we should assert on.
For STABLE kernel, it changes nothing, because it's not compiled with
INVARIANTS. If it was, it would fix crashes. It also fixes an assert
in libc encountered with NFSv4 without nfsuserd(8) running.
Modified:
stable/9/sys/kern/subr_acl_nfs4.c
Directory Properties:
stable/9/sys/ (props changed)
Modified: stable/9/sys/kern/subr_acl_nfs4.c
==============================================================================
--- stable/9/sys/kern/subr_acl_nfs4.c Thu May 24 09:11:38 2012 (r235888)
+++ stable/9/sys/kern/subr_acl_nfs4.c Thu May 24 09:59:58 2012 (r235889)
@@ -114,7 +114,6 @@ _acl_denies(const struct acl *aclp, int
if (denied_explicitly != NULL)
*denied_explicitly = 0;
- KASSERT(aclp->acl_cnt > 0, ("aclp->acl_cnt > 0"));
KASSERT(aclp->acl_cnt <= ACL_MAX_ENTRIES,
("aclp->acl_cnt <= ACL_MAX_ENTRIES"));
@@ -723,7 +722,6 @@ acl_nfs4_sync_mode_from_acl(mode_t *_mod
mode_t old_mode = *_mode, mode = 0, seen = 0;
const struct acl_entry *entry;
- KASSERT(aclp->acl_cnt > 0, ("aclp->acl_cnt > 0"));
KASSERT(aclp->acl_cnt <= ACL_MAX_ENTRIES,
("aclp->acl_cnt <= ACL_MAX_ENTRIES"));
@@ -854,7 +852,6 @@ acl_nfs4_compute_inherited_acl_draft(con
struct acl_entry *entry, *copy;
KASSERT(child_aclp->acl_cnt == 0, ("child_aclp->acl_cnt == 0"));
- KASSERT(parent_aclp->acl_cnt > 0, ("parent_aclp->acl_cnt > 0"));
KASSERT(parent_aclp->acl_cnt <= ACL_MAX_ENTRIES,
("parent_aclp->acl_cnt <= ACL_MAX_ENTRIES"));
@@ -1017,7 +1014,6 @@ acl_nfs4_inherit_entries(const struct ac
const struct acl_entry *parent_entry;
struct acl_entry *entry;
- KASSERT(parent_aclp->acl_cnt > 0, ("parent_aclp->acl_cnt > 0"));
KASSERT(parent_aclp->acl_cnt <= ACL_MAX_ENTRIES,
("parent_aclp->acl_cnt <= ACL_MAX_ENTRIES"));
More information about the svn-src-stable-9
mailing list