Module Name: src
Committed By: yamt
Date: Sun May 31 22:15:13 UTC 2009
Modified Files:
src/sys/kern: sys_descrip.c
Log Message:
do_posix_fadvise: turn some KASSERTs into CTASSERTs.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/kern/sys_descrip.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/sys_descrip.c
diff -u src/sys/kern/sys_descrip.c:1.13 src/sys/kern/sys_descrip.c:1.14
--- src/sys/kern/sys_descrip.c:1.13 Sun May 24 21:41:26 2009
+++ src/sys/kern/sys_descrip.c Sun May 31 22:15:13 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: sys_descrip.c,v 1.13 2009/05/24 21:41:26 ad Exp $ */
+/* $NetBSD: sys_descrip.c,v 1.14 2009/05/31 22:15:13 yamt Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -67,7 +67,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sys_descrip.c,v 1.13 2009/05/24 21:41:26 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sys_descrip.c,v 1.14 2009/05/31 22:15:13 yamt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -614,6 +614,9 @@
{
file_t *fp;
int error;
+ CTASSERT(POSIX_FADV_NORMAL == UVM_ADV_NORMAL);
+ CTASSERT(POSIX_FADV_RANDOM == UVM_ADV_RANDOM);
+ CTASSERT(POSIX_FADV_SEQUENTIAL == UVM_ADV_SEQUENTIAL);
if ((fp = fd_getfile(fd)) == NULL) {
return EBADF;
@@ -632,9 +635,6 @@
case POSIX_FADV_NORMAL:
case POSIX_FADV_RANDOM:
case POSIX_FADV_SEQUENTIAL:
- KASSERT(POSIX_FADV_NORMAL == UVM_ADV_NORMAL);
- KASSERT(POSIX_FADV_RANDOM == UVM_ADV_RANDOM);
- KASSERT(POSIX_FADV_SEQUENTIAL == UVM_ADV_SEQUENTIAL);
/*
* We ignore offset and size. must lock the file to
