Module Name: src
Committed By: dholland
Date: Mon Feb 28 03:23:44 UTC 2011
Modified Files:
src/sys/kern: vfs_syscalls.c
Log Message:
Revert previous, which doesn't cover all the cases if F_OK isn't 0,
and just CTASSERT that it is, as that's not remotely likely to change.
Per source-changes-d; ok by Christos.
To generate a diff of this commit:
cvs rdiff -u -r1.416 -r1.417 src/sys/kern/vfs_syscalls.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/vfs_syscalls.c
diff -u src/sys/kern/vfs_syscalls.c:1.416 src/sys/kern/vfs_syscalls.c:1.417
--- src/sys/kern/vfs_syscalls.c:1.416 Mon Feb 28 00:12:15 2011
+++ src/sys/kern/vfs_syscalls.c Mon Feb 28 03:23:44 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_syscalls.c,v 1.416 2011/02/28 00:12:15 christos Exp $ */
+/* $NetBSD: vfs_syscalls.c,v 1.417 2011/02/28 03:23:44 dholland Exp $ */
/*-
* Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vfs_syscalls.c,v 1.416 2011/02/28 00:12:15 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_syscalls.c,v 1.417 2011/02/28 03:23:44 dholland Exp $");
#ifdef _KERNEL_OPT
#include "opt_fileassoc.h"
@@ -2484,7 +2484,8 @@
struct pathbuf *pb;
struct nameidata nd;
- if ((SCARG(uap, flags) & ~(F_OK | R_OK | W_OK | X_OK)) != 0) {
+ CTASSERT(F_OK == 0);
+ if ((SCARG(uap, flags) & ~(R_OK | W_OK | X_OK)) != 0) {
/* nonsense flags */
return EINVAL;
}
