diff options
| author | sjg <sjg@FreeBSD.org> | 2013-04-12 20:48:55 +0000 |
|---|---|---|
| committer | sjg <sjg@FreeBSD.org> | 2013-04-12 20:48:55 +0000 |
| commit | 97d8b9495668afa398ab17c8c5f7e223b5fd2e89 (patch) | |
| tree | 54038c9ac32a45f8741dcc23fb9a8ffc0e15ff89 /sbin/fsdb | |
| parent | 5ee3bfdb338e7c80af29a67f4425c4be24c7b866 (diff) | |
| parent | 086d73aef6d0ab7d21daa2076fdc8d25961f9b05 (diff) | |
| download | FreeBSD-src-97d8b9495668afa398ab17c8c5f7e223b5fd2e89.zip FreeBSD-src-97d8b9495668afa398ab17c8c5f7e223b5fd2e89.tar.gz | |
sync from head
Diffstat (limited to 'sbin/fsdb')
| -rw-r--r-- | sbin/fsdb/fsdb.c | 7 | ||||
| -rw-r--r-- | sbin/fsdb/fsdbutil.c | 5 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sbin/fsdb/fsdb.c b/sbin/fsdb/fsdb.c index e169061..1315aec 100644 --- a/sbin/fsdb/fsdb.c +++ b/sbin/fsdb/fsdb.c @@ -441,7 +441,8 @@ CMDFUNCSTART(findblk) ino_t inum, inosused; uint32_t *wantedblk32; uint64_t *wantedblk64; - struct cg *cgp = &cgrp; + struct bufarea *cgbp; + struct cg *cgp; int c, i, is_ufs2; wantedblksize = (argc - 1); @@ -473,8 +474,8 @@ CMDFUNCSTART(findblk) */ inum = c * sblock.fs_ipg; /* Read cylinder group. */ - getblk(&cgblk, cgtod(&sblock, c), sblock.fs_cgsize); - memcpy(cgp, cgblk.b_un.b_cg, sblock.fs_cgsize); + cgbp = cgget(c); + cgp = cgbp->b_un.b_cg; /* * Get a highest used inode number for a given cylinder group. * For UFS1 all inodes initialized at the newfs stage. diff --git a/sbin/fsdb/fsdbutil.c b/sbin/fsdb/fsdbutil.c index eaea3db..ba0b64e 100644 --- a/sbin/fsdb/fsdbutil.c +++ b/sbin/fsdb/fsdbutil.c @@ -239,12 +239,11 @@ printindir(ufs2_daddr_t blk, int level, char *bufp) /* for the final indirect level, don't use the cache */ bp = &buf; bp->b_un.b_buf = bufp; - bp->b_prev = bp->b_next = bp; - initbarea(bp); + initbarea(bp, BT_UNKNOWN); getblk(bp, blk, sblock.fs_bsize); } else - bp = getdatablk(blk, sblock.fs_bsize); + bp = getdatablk(blk, sblock.fs_bsize, BT_UNKNOWN); cpl = charsperline(); for (i = charssofar = 0; i < NINDIR(&sblock); i++) { |
