From owner-svn-src-all@FreeBSD.ORG  Sun Sep 30 07:52:41 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 3289A106566C;
	Sun, 30 Sep 2012 07:52:41 +0000 (UTC) (envelope-from ae@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 1E4A78FC15;
	Sun, 30 Sep 2012 07:52:41 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q8U7qe6w089729;
	Sun, 30 Sep 2012 07:52:40 GMT (envelope-from ae@svn.freebsd.org)
Received: (from ae@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q8U7qex3089727;
	Sun, 30 Sep 2012 07:52:40 GMT (envelope-from ae@svn.freebsd.org)
Message-Id: <201209300752.q8U7qex3089727@svn.freebsd.org>
From: "Andrey V. Elsukov" <ae@FreeBSD.org>
Date: Sun, 30 Sep 2012 07:52:40 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r241065 - head/sys/boot/common
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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: Sun, 30 Sep 2012 07:52:41 -0000

Author: ae
Date: Sun Sep 30 07:52:40 2012
New Revision: 241065
URL: http://svn.freebsd.org/changeset/base/241065

Log:
  Fix disk_cleanup() to work without DISK_DEBUG too.

Modified:
  head/sys/boot/common/disk.c

Modified: head/sys/boot/common/disk.c
==============================================================================
--- head/sys/boot/common/disk.c	Sun Sep 30 07:51:57 2012	(r241064)
+++ head/sys/boot/common/disk.c	Sun Sep 30 07:52:40 2012	(r241065)
@@ -373,7 +373,9 @@ disk_close(struct disk_devdesc *dev)
 void
 disk_cleanup(const struct devsw *d_dev)
 {
+#ifdef DISK_DEBUG
 	struct disk_devdesc dev;
+#endif
 	struct dentry *entry, *tmp;
 
 	STAILQ_FOREACH_SAFE(entry, &opened_disks, entry, tmp) {
@@ -385,10 +387,10 @@ disk_cleanup(const struct devsw *d_dev)
 		dev.d_unit = entry->d_unit;
 		dev.d_slice = entry->d_slice;
 		dev.d_partition = entry->d_partition;
-		STAILQ_REMOVE(&opened_disks, entry, dentry, entry);
 		DEBUG("%s was freed => %p [%d]", disk_fmtdev(&dev),
 		    entry->od, entry->od->rcnt);
 #endif
+		STAILQ_REMOVE(&opened_disks, entry, dentry, entry);
 		if (entry->od->rcnt < 1) {
 			if (entry->od->table != NULL)
 				ptable_close(entry->od->table);