From ebda366c1c179d499b8d1704c83254c320889e00 Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Tue, 7 Jul 2009 16:22:33 -0700 Subject: [PATCH 1/2] Add missing case introduced by rebase. --- module/zfs/spa.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/module/zfs/spa.c b/module/zfs/spa.c index cca406c9af..cb2a743efc 100644 --- a/module/zfs/spa.c +++ b/module/zfs/spa.c @@ -1130,6 +1130,8 @@ int spa_check_logs(spa_t *spa) { switch (spa->spa_log_state) { + default: + break; case SPA_LOG_MISSING: /* need to recheck in case slog has been restored */ case SPA_LOG_UNKNOWN: From 10dcf485d3dd2aa42ce28231e7cbc979deb394ea Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Tue, 7 Jul 2009 16:23:09 -0700 Subject: [PATCH 2/2] First fit allocator unused comment it out. --- module/zfs/metaslab.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/module/zfs/metaslab.c b/module/zfs/metaslab.c index 77556ac5d7..bbe59f834a 100644 --- a/module/zfs/metaslab.c +++ b/module/zfs/metaslab.c @@ -258,6 +258,7 @@ metaslab_block_picker(avl_tree_t *t, uint64_t *cursor, uint64_t size, return (metaslab_block_picker(t, cursor, size, align)); } +#if 0 /* * ========================================================================== * The first-fit block allocator @@ -310,6 +311,7 @@ static space_map_ops_t metaslab_ff_ops = { metaslab_ff_free, NULL /* maxsize */ }; +#endif /* * Dynamic block allocator -