summaryrefslogtreecommitdiffstats
path: root/sys/boot/common
diff options
context:
space:
mode:
authorae <ae@FreeBSD.org>2012-09-30 07:52:40 +0000
committerae <ae@FreeBSD.org>2012-09-30 07:52:40 +0000
commit810d3ec225cddddc95cf3b9f7058a4253ec1e486 (patch)
tree944d17a6055ff44740f24a455bc01fc932ac71cf /sys/boot/common
parent68ac3a8b2c6124e85f6dc977cec84533ae2370c8 (diff)
downloadFreeBSD-src-810d3ec225cddddc95cf3b9f7058a4253ec1e486.zip
FreeBSD-src-810d3ec225cddddc95cf3b9f7058a4253ec1e486.tar.gz
Fix disk_cleanup() to work without DISK_DEBUG too.
Diffstat (limited to 'sys/boot/common')
-rw-r--r--sys/boot/common/disk.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/sys/boot/common/disk.c b/sys/boot/common/disk.c
index 1fcaf2b..73d58ea 100644
--- a/sys/boot/common/disk.c
+++ b/sys/boot/common/disk.c
@@ -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);
OpenPOWER on IntegriCloud