summaryrefslogtreecommitdiffstats
path: root/sys/ufs
diff options
context:
space:
mode:
authormarcel <marcel@FreeBSD.org>2004-07-10 20:45:47 +0000
committermarcel <marcel@FreeBSD.org>2004-07-10 20:45:47 +0000
commitcdeb3179e784c4433c8f76634a6faac526b1dd14 (patch)
treec9defb982d49a81fa51e5e57e601efc3658696ef /sys/ufs
parent486eb0f23ad4dd5c60524f5f787be178d5529995 (diff)
downloadFreeBSD-src-cdeb3179e784c4433c8f76634a6faac526b1dd14.zip
FreeBSD-src-cdeb3179e784c4433c8f76634a6faac526b1dd14.tar.gz
Update for the KDB debugger framework:
o Make debugging code conditional upon KDB. o Use kdb_backtrace() instead of backtrace(). o Remove inclusion of opt_ddb.h.
Diffstat (limited to 'sys/ufs')
-rw-r--r--sys/ufs/ffs/ffs_softdep.c3
-rw-r--r--sys/ufs/ffs/ffs_subr.c8
2 files changed, 5 insertions, 6 deletions
diff --git a/sys/ufs/ffs/ffs_softdep.c b/sys/ufs/ffs/ffs_softdep.c
index 785f430..e55464e 100644
--- a/sys/ufs/ffs/ffs_softdep.c
+++ b/sys/ufs/ffs/ffs_softdep.c
@@ -56,6 +56,7 @@ __FBSDID("$FreeBSD$");
#include <sys/systm.h>
#include <sys/bio.h>
#include <sys/buf.h>
+#include <sys/kdb.h>
#include <sys/malloc.h>
#include <sys/mount.h>
#include <sys/proc.h>
@@ -5866,7 +5867,7 @@ getdirtybuf(bpp, mtx, waitfor)
if ((bp = *bpp) == NULL)
return (0);
if (bp->b_vp == NULL)
- backtrace();
+ kdb_backtrace();
if (BUF_LOCK(bp, LK_EXCLUSIVE | LK_NOWAIT, NULL) == 0) {
if ((bp->b_vflags & BV_BKGRDINPROG) == 0)
break;
diff --git a/sys/ufs/ffs/ffs_subr.c b/sys/ufs/ffs/ffs_subr.c
index 08f60ce..84295b9 100644
--- a/sys/ufs/ffs/ffs_subr.c
+++ b/sys/ufs/ffs/ffs_subr.c
@@ -39,8 +39,6 @@ __FBSDID("$FreeBSD$");
#include <ufs/ffs/fs.h>
#include "fsck.h"
#else
-#include "opt_ddb.h"
-
#include <sys/systm.h>
#include <sys/lock.h>
#include <sys/malloc.h>
@@ -58,7 +56,7 @@ __FBSDID("$FreeBSD$");
#include <ufs/ffs/ffs_extern.h>
#include <ufs/ffs/fs.h>
-#ifdef DDB
+#ifdef KDB
void ffs_checkoverlap(struct buf *, struct inode *);
#endif
@@ -168,7 +166,7 @@ ffs_fragacct(fs, fragmap, fraglist, cnt)
}
}
-#ifdef DDB
+#ifdef KDB
void
ffs_checkoverlap(bp, ip)
struct buf *bp;
@@ -197,7 +195,7 @@ ffs_checkoverlap(bp, ip)
panic("ffs_checkoverlap: Disk buffer overlap");
}
}
-#endif /* DDB */
+#endif /* KDB */
/*
* block operations
OpenPOWER on IntegriCloud