Module Name: src
Committed By: maya
Date: Wed Mar 15 21:28:41 UTC 2017
Modified Files:
src/sys/ufs/lfs: lfs_inode.c lfs_vnops.c
Log Message:
print inode number in an assert I keep hitting and the adjacent one.
use PRIx64 for printing inode number elsewhere.
To generate a diff of this commit:
cvs rdiff -u -r1.148 -r1.149 src/sys/ufs/lfs/lfs_inode.c
cvs rdiff -u -r1.304 -r1.305 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_inode.c
diff -u src/sys/ufs/lfs/lfs_inode.c:1.148 src/sys/ufs/lfs/lfs_inode.c:1.149
--- src/sys/ufs/lfs/lfs_inode.c:1.148 Mon Mar 13 13:45:53 2017
+++ src/sys/ufs/lfs/lfs_inode.c Wed Mar 15 21:28:41 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: lfs_inode.c,v 1.148 2017/03/13 13:45:53 riastradh Exp $ */
+/* $NetBSD: lfs_inode.c,v 1.149 2017/03/15 21:28:41 maya 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_inode.c,v 1.148 2017/03/13 13:45:53 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lfs_inode.c,v 1.149 2017/03/15 21:28:41 maya Exp $");
#if defined(_KERNEL_OPT)
#include "opt_quota.h"
@@ -149,7 +149,7 @@ lfs_update(struct vnode *vp, const struc
mutex_enter(vp->v_interlock);
while ((updflags & (UPDATE_WAIT|UPDATE_DIROP)) == UPDATE_WAIT &&
WRITEINPROG(vp)) {
- DLOG((DLOG_SEG, "lfs_update: sleeping on ino %d"
+ DLOG((DLOG_SEG, "lfs_update: sleeping on ino %"PRIx64
" (in progress)\n", ip->i_number));
cv_wait(&vp->v_cv, vp->v_interlock);
}
@@ -168,7 +168,7 @@ lfs_update(struct vnode *vp, const struc
mutex_enter(&lfs_lock);
++fs->lfs_diropwait;
while (vp->v_uflag & VU_DIROP) {
- DLOG((DLOG_DIROP, "lfs_update: sleeping on inode %d"
+ DLOG((DLOG_DIROP, "lfs_update: sleeping on inode %"PRIx64
" (dirops)\n", ip->i_number));
DLOG((DLOG_DIROP, "lfs_update: vflags 0x%x, iflags"
" 0x%x\n",
@@ -590,12 +590,12 @@ done:
KASSERTMSG((oip->i_size != 0 ||
lfs_dino_getblocks(fs, oip->i_din) == 0),
- "truncate to 0 but %jd blks/%jd effblks",
- lfs_dino_getblocks(fs, oip->i_din),
+ "ino %"PRIx64" truncate to 0 but %jd blks/%jd effblks",
+ oip->i_number, lfs_dino_getblocks(fs, oip->i_din),
oip->i_lfs_effnblks);
KASSERTMSG((oip->i_size != 0 || oip->i_lfs_effnblks == 0),
- "truncate to 0 but %jd blks/%jd effblks",
- lfs_dino_getblocks(fs, oip->i_din),
+ "ino %"PRIx64" truncate to 0 but %jd blks/%jd effblks",
+ oip->i_number, lfs_dino_getblocks(fs, oip->i_din),
oip->i_lfs_effnblks);
/*
Index: src/sys/ufs/lfs/lfs_vnops.c
diff -u src/sys/ufs/lfs/lfs_vnops.c:1.304 src/sys/ufs/lfs/lfs_vnops.c:1.305
--- src/sys/ufs/lfs/lfs_vnops.c:1.304 Wed Jul 13 16:26:26 2016
+++ src/sys/ufs/lfs/lfs_vnops.c Wed Mar 15 21:28:41 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: lfs_vnops.c,v 1.304 2016/07/13 16:26:26 maya Exp $ */
+/* $NetBSD: lfs_vnops.c,v 1.305 2017/03/15 21:28:41 maya 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.304 2016/07/13 16:26:26 maya Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lfs_vnops.c,v 1.305 2017/03/15 21:28:41 maya Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -539,7 +539,7 @@ lfs_inactive(void *v)
*/
if (ap->a_vp->v_uflag & VU_DIROP) {
struct inode *ip = VTOI(ap->a_vp);
- printf("lfs_inactive: inactivating VU_DIROP? ino = %d\n", (int)ip->i_number);
+ printf("lfs_inactive: inactivating VU_DIROP? ino = %"PRIx64"\n", ip->i_number);
}
#endif /* DIAGNOSTIC */
@@ -837,8 +837,7 @@ lfs_mknod(void *v)
* Can this ever happen (barring hardware failure)?
*/
if ((error = VOP_FSYNC(*vpp, NOCRED, FSYNC_WAIT, 0, 0)) != 0) {
- panic("lfs_mknod: couldn't fsync (ino %llu)",
- (unsigned long long)ino);
+ panic("lfs_mknod: couldn't fsync (ino %"PRIx64")", ino);
/* return (error); */
}
@@ -1520,14 +1519,14 @@ lfs_strategy(void *v)
if (sn == lfs_dtosn(fs, fs->lfs_cleanint[i]) &&
tbn >= fs->lfs_cleanint[i]) {
DLOG((DLOG_CLEAN,
- "lfs_strategy: ino %d lbn %" PRId64
+ "lfs_strategy: ino %"PRIx64" lbn %" PRId64
" ind %d sn %d fsb %" PRIx64
" given sn %d fsb %" PRIx64 "\n",
ip->i_number, bp->b_lblkno, i,
lfs_dtosn(fs, fs->lfs_cleanint[i]),
fs->lfs_cleanint[i], sn, tbn));
DLOG((DLOG_CLEAN,
- "lfs_strategy: sleeping on ino %d lbn %"
+ "lfs_strategy: sleeping on ino %"PRIx64" lbn %"
PRId64 "\n", ip->i_number, bp->b_lblkno));
mutex_enter(&lfs_lock);
if (LFS_SEGLOCK_HELD(fs) && fs->lfs_iocount) {
