Module Name: src
Committed By: riastradh
Date: Sun Feb 23 08:40:08 UTC 2020
Modified Files:
src/sys/ufs/lfs: lfs_segment.c lfs_vnops.c
Log Message:
Change some cheap KDASSERT into KASSERT.
To generate a diff of this commit:
cvs rdiff -u -r1.283 -r1.284 src/sys/ufs/lfs/lfs_segment.c
cvs rdiff -u -r1.327 -r1.328 src/sys/ufs/lfs/lfs_vnops.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/lfs/lfs_segment.c
diff -u src/sys/ufs/lfs/lfs_segment.c:1.283 src/sys/ufs/lfs/lfs_segment.c:1.284
--- src/sys/ufs/lfs/lfs_segment.c:1.283 Sat Feb 22 22:20:47 2020
+++ src/sys/ufs/lfs/lfs_segment.c Sun Feb 23 08:40:08 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: lfs_segment.c,v 1.283 2020/02/22 22:20:47 ad Exp $ */
+/* $NetBSD: lfs_segment.c,v 1.284 2020/02/23 08:40:08 riastradh Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2002, 2003 The NetBSD Foundation, Inc.
@@ -60,7 +60,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lfs_segment.c,v 1.283 2020/02/22 22:20:47 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lfs_segment.c,v 1.284 2020/02/23 08:40:08 riastradh Exp $");
#ifdef DEBUG
# define vndebug(vp, str) do { \
@@ -396,7 +396,7 @@ lfs_vflush(struct vnode *vp)
* still not done with this vnode.
* XXX we can do better than this.
*/
- KDASSERT(ip->i_number != LFS_IFILE_INUM);
+ KASSERT(ip->i_number != LFS_IFILE_INUM);
lfs_writeinode(fs, sp, ip);
mutex_enter(&lfs_lock);
LFS_SET_UINO(ip, IN_MODIFIED);
Index: src/sys/ufs/lfs/lfs_vnops.c
diff -u src/sys/ufs/lfs/lfs_vnops.c:1.327 src/sys/ufs/lfs/lfs_vnops.c:1.328
--- src/sys/ufs/lfs/lfs_vnops.c:1.327 Sun Feb 23 08:39:39 2020
+++ src/sys/ufs/lfs/lfs_vnops.c Sun Feb 23 08:40:08 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: lfs_vnops.c,v 1.327 2020/02/23 08:39:39 riastradh Exp $ */
+/* $NetBSD: lfs_vnops.c,v 1.328 2020/02/23 08:40:08 riastradh Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2002, 2003 The NetBSD Foundation, Inc.
@@ -125,7 +125,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lfs_vnops.c,v 1.327 2020/02/23 08:39:39 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lfs_vnops.c,v 1.328 2020/02/23 08:40:08 riastradh Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -1707,7 +1707,7 @@ lfs_flush_dirops(struct lfs *fs)
break;
}
}
- KDASSERT(ip->i_number != LFS_IFILE_INUM);
+ KASSERT(ip->i_number != LFS_IFILE_INUM);
error = lfs_writeinode(fs, sp, ip);
mutex_enter(&lfs_lock);
if (error && (sp->seg_flags & SEGM_SINGLE)) {
@@ -1829,7 +1829,7 @@ lfs_flush_pchain(struct lfs *fs)
LFS_SET_UINO(ip, IN_MODIFIED);
mutex_exit(&lfs_lock);
}
- KDASSERT(ip->i_number != LFS_IFILE_INUM);
+ KASSERT(ip->i_number != LFS_IFILE_INUM);
error2 = lfs_writeinode(fs, sp, ip);
VOP_UNLOCK(vp);
