Skip site navigation (1)Skip section navigation (2) 
Date:      Wed, 5 Oct 2011 17:29:49 +0000 (UTC)
From:      Edward Tomasz Napierala <trasz@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r226043 - head/sys/kern
Message-ID:  <201110051729.p95HTnq2021881@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: trasz
Date: Wed Oct  5 17:29:49 2011
New Revision: 226043
URL: http://svn.freebsd.org/changeset/base/226043

Log:
  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.
  
  Submitted by:	Yuri Pankov (earlier version)
  MFC after:	1 month

Modified:
  head/sys/kern/subr_acl_nfs4.c

Modified: head/sys/kern/subr_acl_nfs4.c
==============================================================================
--- head/sys/kern/subr_acl_nfs4.c	Wed Oct  5 16:56:06 2011	(r226042)
+++ head/sys/kern/subr_acl_nfs4.c	Wed Oct  5 17:29:49 2011	(r226043)
@@ -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"));

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201110051729.p95HTnq2021881>