From e1c7cfb20052715b26698bc369cfdc2ae22dd0bc Mon Sep 17 00:00:00 2001 From: Glen Barber Date: Sat, 23 Mar 2013 08:57:14 +0000 Subject: [PATCH] Revert r248639 to fix build failure on head/ --- sbin/fsdb/fsdb.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/sbin/fsdb/fsdb.c b/sbin/fsdb/fsdb.c index 1315aeca0acb..e169061e9f65 100644 --- a/sbin/fsdb/fsdb.c +++ b/sbin/fsdb/fsdb.c @@ -441,8 +441,7 @@ CMDFUNCSTART(findblk) ino_t inum, inosused; uint32_t *wantedblk32; uint64_t *wantedblk64; - struct bufarea *cgbp; - struct cg *cgp; + struct cg *cgp = &cgrp; int c, i, is_ufs2; wantedblksize = (argc - 1); @@ -474,8 +473,8 @@ CMDFUNCSTART(findblk) */ inum = c * sblock.fs_ipg; /* Read cylinder group. */ - cgbp = cgget(c); - cgp = cgbp->b_un.b_cg; + getblk(&cgblk, cgtod(&sblock, c), sblock.fs_cgsize); + memcpy(cgp, cgblk.b_un.b_cg, sblock.fs_cgsize); /* * Get a highest used inode number for a given cylinder group. * For UFS1 all inodes initialized at the newfs stage.