From owner-svn-src-head@FreeBSD.ORG  Sat Mar 23 07:57:31 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id F1EF187A;
 Sat, 23 Mar 2013 07:57:30 +0000 (UTC)
 (envelope-from mckusick@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id E53419E0;
 Sat, 23 Mar 2013 07:57:30 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r2N7vUn6039831;
 Sat, 23 Mar 2013 07:57:30 GMT
 (envelope-from mckusick@svn.freebsd.org)
Received: (from mckusick@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r2N7vUop039830;
 Sat, 23 Mar 2013 07:57:30 GMT
 (envelope-from mckusick@svn.freebsd.org)
Message-Id: <201303230757.r2N7vUop039830@svn.freebsd.org>
From: Kirk McKusick <mckusick@FreeBSD.org>
Date: Sat, 23 Mar 2013 07:57:30 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r248639 - head/sbin/fsdb
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 23 Mar 2013 07:57:31 -0000

Author: mckusick
Date: Sat Mar 23 07:57:30 2013
New Revision: 248639
URL: http://svnweb.freebsd.org/changeset/base/248639

Log:
  Fix the build after addition of cylinder group cacheing (r248625)
  
  Reported by:   Glen Barber (gjb@)
  Pointy hat to: Kirk McKusick (mckusick@)

Modified:
  head/sbin/fsdb/fsdb.c

Modified: head/sbin/fsdb/fsdb.c
==============================================================================
--- head/sbin/fsdb/fsdb.c	Sat Mar 23 07:36:53 2013	(r248638)
+++ head/sbin/fsdb/fsdb.c	Sat Mar 23 07:57:30 2013	(r248639)
@@ -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.