Module Name: src
Committed By: riastradh
Date: Sat Mar 28 03:53:36 UTC 2015
Modified Files:
src/sys/ufs/ext2fs: ext2fs_readwrite.c
src/sys/ufs/lfs: ulfs_readwrite.c
src/sys/ufs/ufs: ufs_readwrite.c
Log Message:
Turn some `#if DIAGNOSTIC' into KASSERT.
To generate a diff of this commit:
cvs rdiff -u -r1.69 -r1.70 src/sys/ufs/ext2fs/ext2fs_readwrite.c
cvs rdiff -u -r1.9 -r1.10 src/sys/ufs/lfs/ulfs_readwrite.c
cvs rdiff -u -r1.109 -r1.110 src/sys/ufs/ufs/ufs_readwrite.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/ufs/ext2fs/ext2fs_readwrite.c
diff -u src/sys/ufs/ext2fs/ext2fs_readwrite.c:1.69 src/sys/ufs/ext2fs/ext2fs_readwrite.c:1.70
--- src/sys/ufs/ext2fs/ext2fs_readwrite.c:1.69 Sat Mar 28 03:49:41 2015
+++ src/sys/ufs/ext2fs/ext2fs_readwrite.c Sat Mar 28 03:53:36 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ext2fs_readwrite.c,v 1.69 2015/03/28 03:49:41 riastradh Exp $ */
+/* $NetBSD: ext2fs_readwrite.c,v 1.70 2015/03/28 03:53:36 riastradh Exp $ */
/*-
* Copyright (c) 1993
@@ -60,7 +60,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ext2fs_readwrite.c,v 1.69 2015/03/28 03:49:41 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ext2fs_readwrite.c,v 1.70 2015/03/28 03:53:36 riastradh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -108,13 +108,9 @@ ext2fs_read(void *v)
uio = ap->a_uio;
error = 0;
-#ifdef DIAGNOSTIC
- if (uio->uio_rw != UIO_READ)
- panic("%s: mode", "ext2fs_read");
-
- if (vp->v_type != VREG && vp->v_type != VDIR)
- panic("%s: type %d", "ext2fs_read", vp->v_type);
-#endif
+ KASSERT(uio->uio_rw == UIO_READ);
+ KASSERT(vp->v_type == VREG || vp->v_type == VDIR);
+
/* XXX Eliminate me by refusing directory reads from userland. */
if (vp->v_type == VDIR)
return ext2fs_bufrd(vp, uio, ap->a_ioflag, ap->a_cred);
@@ -272,22 +268,14 @@ ext2fs_write(void *v)
ump = ip->i_ump;
error = 0;
-#ifdef DIAGNOSTIC
- if (uio->uio_rw != UIO_WRITE)
- panic("%s: mode", "ext2fs_write");
-#endif
-
- switch (vp->v_type) {
- case VREG:
- if (ioflag & IO_APPEND)
- uio->uio_offset = ext2fs_size(ip);
- if ((ip->i_e2fs_flags & EXT2_APPEND) &&
- uio->uio_offset != ext2fs_size(ip))
- return (EPERM);
- break;
- default:
- panic("%s: type", "ext2fs_write");
- }
+ KASSERT(uio->uio_rw == UIO_WRITE);
+ KASSERT(vp->v_type == VREG);
+
+ if (ioflag & IO_APPEND)
+ uio->uio_offset = ext2fs_size(ip);
+ if ((ip->i_e2fs_flags & EXT2_APPEND) &&
+ uio->uio_offset != ext2fs_size(ip))
+ return (EPERM);
fs = ip->i_e2fs;
if (uio->uio_offset < 0 ||
Index: src/sys/ufs/lfs/ulfs_readwrite.c
diff -u src/sys/ufs/lfs/ulfs_readwrite.c:1.9 src/sys/ufs/lfs/ulfs_readwrite.c:1.10
--- src/sys/ufs/lfs/ulfs_readwrite.c:1.9 Fri Mar 27 19:47:14 2015
+++ src/sys/ufs/lfs/ulfs_readwrite.c Sat Mar 28 03:53:36 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ulfs_readwrite.c,v 1.9 2015/03/27 19:47:14 riastradh Exp $ */
+/* $NetBSD: ulfs_readwrite.c,v 1.10 2015/03/28 03:53:36 riastradh Exp $ */
/* from NetBSD: ufs_readwrite.c,v 1.105 2013/01/22 09:39:18 dholland Exp */
/*-
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: ulfs_readwrite.c,v 1.9 2015/03/27 19:47:14 riastradh Exp $");
+__KERNEL_RCSID(1, "$NetBSD: ulfs_readwrite.c,v 1.10 2015/03/28 03:53:36 riastradh Exp $");
#ifdef LFS_READWRITE
#define FS struct lfs
@@ -84,13 +84,9 @@ READ(void *v)
ioflag = ap->a_ioflag;
error = 0;
-#ifdef DIAGNOSTIC
- if (uio->uio_rw != UIO_READ)
- panic("%s: mode", READ_S);
+ KASSERT(uio->uio_rw == UIO_READ);
+ KASSERT(vp->v_type == VREG || vp->v_type == VDIR);
- if (vp->v_type != VREG && vp->v_type != VDIR)
- panic("%s: type %d", READ_S, vp->v_type);
-#endif
/* XXX Eliminate me by refusing directory reads from userland. */
if (vp->v_type == VDIR)
return BUFRD(vp, uio, ioflag, ap->a_cred);
@@ -269,21 +265,13 @@ WRITE(void *v)
ip = VTOI(vp);
KASSERT(vp->v_size == ip->i_size);
-#ifdef DIAGNOSTIC
- if (uio->uio_rw != UIO_WRITE)
- panic("%s: mode", WRITE_S);
-#endif
+ KASSERT(uio->uio_rw == UIO_WRITE);
+ KASSERT(vp->v_type == VREG);
- switch (vp->v_type) {
- case VREG:
- if (ioflag & IO_APPEND)
- uio->uio_offset = ip->i_size;
- if ((ip->i_flags & APPEND) && uio->uio_offset != ip->i_size)
- return (EPERM);
- break;
- default:
- panic("%s: type", WRITE_S);
- }
+ if (ioflag & IO_APPEND)
+ uio->uio_offset = ip->i_size;
+ if ((ip->i_flags & APPEND) && uio->uio_offset != ip->i_size)
+ return (EPERM);
fs = ip->I_FS;
if (uio->uio_offset < 0 ||
Index: src/sys/ufs/ufs/ufs_readwrite.c
diff -u src/sys/ufs/ufs/ufs_readwrite.c:1.109 src/sys/ufs/ufs/ufs_readwrite.c:1.110
--- src/sys/ufs/ufs/ufs_readwrite.c:1.109 Fri Mar 27 19:47:14 2015
+++ src/sys/ufs/ufs/ufs_readwrite.c Sat Mar 28 03:53:36 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ufs_readwrite.c,v 1.109 2015/03/27 19:47:14 riastradh Exp $ */
+/* $NetBSD: ufs_readwrite.c,v 1.110 2015/03/28 03:53:36 riastradh Exp $ */
/*-
* Copyright (c) 1993
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: ufs_readwrite.c,v 1.109 2015/03/27 19:47:14 riastradh Exp $");
+__KERNEL_RCSID(1, "$NetBSD: ufs_readwrite.c,v 1.110 2015/03/28 03:53:36 riastradh Exp $");
#ifdef LFS_READWRITE
#define FS struct lfs
@@ -96,13 +96,9 @@ READ(void *v)
ioflag = ap->a_ioflag;
error = 0;
-#ifdef DIAGNOSTIC
- if (uio->uio_rw != UIO_READ)
- panic("%s: mode", READ_S);
+ KASSERT(uio->uio_rw == UIO_READ);
+ KASSERT(vp->v_type == VREG || vp->v_type == VDIR);
- if (vp->v_type != VREG && vp->v_type != VDIR)
- panic("%s: type %d", READ_S, vp->v_type);
-#endif
/* XXX Eliminate me by refusing directory reads from userland. */
if (vp->v_type == VDIR)
return BUFRD(vp, uio, ioflag, ap->a_cred);
@@ -294,21 +290,13 @@ WRITE(void *v)
ump = ip->i_ump;
KASSERT(vp->v_size == ip->i_size);
-#ifdef DIAGNOSTIC
- if (uio->uio_rw != UIO_WRITE)
- panic("%s: mode", WRITE_S);
-#endif
+ KASSERT(uio->uio_rw == UIO_WRITE);
+ KASSERT(vp->v_type == VREG);
- switch (vp->v_type) {
- case VREG:
- if (ioflag & IO_APPEND)
- uio->uio_offset = ip->i_size;
- if ((ip->i_flags & APPEND) && uio->uio_offset != ip->i_size)
- return (EPERM);
- break;
- default:
- panic("%s: type", WRITE_S);
- }
+ if (ioflag & IO_APPEND)
+ uio->uio_offset = ip->i_size;
+ if ((ip->i_flags & APPEND) && uio->uio_offset != ip->i_size)
+ return (EPERM);
fs = ip->I_FS;
if (uio->uio_offset < 0 ||
