From owner-svn-src-stable-7@FreeBSD.ORG Tue Jul 5 14:58:11 2011 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1CC3A106566B; Tue, 5 Jul 2011 14:58:11 +0000 (UTC) (envelope-from jonathan@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 0C53A8FC1A; Tue, 5 Jul 2011 14:58:11 +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 p65EwAan074040; Tue, 5 Jul 2011 14:58:10 GMT (envelope-from jonathan@svn.freebsd.org) Received: (from jonathan@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p65EwAiB074038; Tue, 5 Jul 2011 14:58:10 GMT (envelope-from jonathan@svn.freebsd.org) Message-Id: <201107051458.p65EwAiB074038@svn.freebsd.org> From: Jonathan Anderson Date: Tue, 5 Jul 2011 14:58:10 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r223791 - stable/7/sys/kern X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 05 Jul 2011 14:58:11 -0000 Author: jonathan Date: Tue Jul 5 14:58:10 2011 New Revision: 223791 URL: http://svn.freebsd.org/changeset/base/223791 Log: Merge r223505 from HEAD to stable/7: -- Tidy up a capabilities-related comment. This commit refers to an #ifdef that hasn't been merged [yet?]; remove it. Approved by: rwatson -- Modified: stable/7/sys/kern/vfs_subr.c Directory Properties: stable/7/sys/ (props changed) stable/7/sys/cddl/contrib/opensolaris/ (props changed) stable/7/sys/contrib/dev/acpica/ (props changed) stable/7/sys/contrib/pf/ (props changed) Modified: stable/7/sys/kern/vfs_subr.c ============================================================================== --- stable/7/sys/kern/vfs_subr.c Tue Jul 5 14:55:17 2011 (r223790) +++ stable/7/sys/kern/vfs_subr.c Tue Jul 5 14:58:10 2011 (r223791) @@ -3481,9 +3481,6 @@ vn_isdisk(struct vnode *vp, int *errp) * and optional call-by-reference privused argument allowing vaccess() * to indicate to the caller whether privilege was used to satisfy the * request (obsoleted). Returns 0 on success, or an errno on failure. - * - * The ifdef'd CAPABILITIES version is here for reference, but is not - * actually used. */ int vaccess(enum vtype type, mode_t file_mode, uid_t file_uid, gid_t file_gid,