Author: jonathan
Date: Tue Jul 5 14:54:33 2011
New Revision: 223789
URL: http://svn.freebsd.org/changeset/base/223789
Log:
Merge r223505 from HEAD to stable/8:
--
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/8/sys/kern/vfs_subr.c
Directory Properties:
stable/8/sys/ (props changed)
stable/8/sys/amd64/include/xen/ (props changed)
stable/8/sys/cddl/contrib/opensolaris/ (props changed)
stable/8/sys/contrib/dev/acpica/ (props changed)
stable/8/sys/contrib/pf/ (props changed)
Modified: stable/8/sys/kern/vfs_subr.c
==============================================================================
--- stable/8/sys/kern/vfs_subr.c Tue Jul 5 14:50:06 2011 (r223788)
+++ stable/8/sys/kern/vfs_subr.c Tue Jul 5 14:54:33 2011 (r223789)
@@ -3567,9 +3567,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,