svn commit: r223791 - stable/7/sys/kern

[Jonathan Anderson]

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,