From owner-svn-src-stable-9@FreeBSD.ORG Thu May 24 09:59:59 2012
Return-Path: <owner-svn-src-stable-9@FreeBSD.ORG>
Delivered-To: svn-src-stable-9@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
by hub.freebsd.org (Postfix) with ESMTP id 52E6A106564A;
Thu, 24 May 2012 09:59:59 +0000 (UTC)
(envelope-from trasz@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
by mx1.freebsd.org (Postfix) with ESMTP id 2379E8FC18;
Thu, 24 May 2012 09:59:59 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q4O9xwiN028974;
Thu, 24 May 2012 09:59:58 GMT (envelope-from trasz@svn.freebsd.org)
Received: (from trasz@localhost)
by svn.freebsd.org (8.14.4/8.14.4/Submit) id q4O9xwcd028972;
Thu, 24 May 2012 09:59:58 GMT (envelope-from trasz@svn.freebsd.org)
Message-Id: <201205240959.q4O9xwcd028972@svn.freebsd.org>
From: Edward Tomasz Napierala <trasz@FreeBSD.org>
Date: Thu, 24 May 2012 09:59:58 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc:
Subject: svn commit: r235889 - stable/9/sys/kern
X-BeenThere: svn-src-stable-9@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 9-stable src tree
<svn-src-stable-9.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>,
<mailto:svn-src-stable-9-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-9>
List-Post: <mailto:svn-src-stable-9@freebsd.org>
List-Help: <mailto:svn-src-stable-9-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>,
<mailto:svn-src-stable-9-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 24 May 2012 09:59:59 -0000
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"));