From owner-svn-src-all@FreeBSD.ORG  Sat Mar 23 08:57:15 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@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 13AF8E1E;
 Sat, 23 Mar 2013 08:57:15 +0000 (UTC) (envelope-from gjb@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 06FF7B3B;
 Sat, 23 Mar 2013 08:57:15 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r2N8vEB8058605;
 Sat, 23 Mar 2013 08:57:14 GMT (envelope-from gjb@svn.freebsd.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r2N8vEAZ058604;
 Sat, 23 Mar 2013 08:57:14 GMT (envelope-from gjb@svn.freebsd.org)
Message-Id: <201303230857.r2N8vEAZ058604@svn.freebsd.org>
From: Glen Barber <gjb@FreeBSD.org>
Date: Sat, 23 Mar 2013 08:57:14 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r248643 - 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-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 23 Mar 2013 08:57:15 -0000

Author: gjb (doc,ports committer)
Date: Sat Mar 23 08:57:14 2013
New Revision: 248643
URL: http://svnweb.freebsd.org/changeset/base/248643

Log:
  Revert r248639 to fix build failure on head/

Modified:
  head/sbin/fsdb/fsdb.c

Modified: head/sbin/fsdb/fsdb.c
==============================================================================
--- head/sbin/fsdb/fsdb.c	Sat Mar 23 08:52:50 2013	(r248642)
+++ head/sbin/fsdb/fsdb.c	Sat Mar 23 08:57:14 2013	(r248643)
@@ -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.