diff options
| author | Brian Behlendorf <[email protected]> | 2009-07-07 16:30:56 -0700 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2009-07-07 16:30:56 -0700 |
| commit | 02362668ac3e242c9d671f0e4f5786da6cebfb64 (patch) | |
| tree | 417a8311e7e163b68e2c7d2479d8fe99c18fd410 /module | |
| parent | 04a83f2337c5113d4cc2304824c31b199646bbcc (diff) | |
| parent | d515750ecf20ddf8baf36347cb6d4d20309910ad (diff) | |
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
Diffstat (limited to 'module')
| -rw-r--r-- | module/zfs/metaslab.c | 2 | ||||
| -rw-r--r-- | module/zfs/spa.c | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/module/zfs/metaslab.c b/module/zfs/metaslab.c index 987617ffe..91ab791f0 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 - diff --git a/module/zfs/spa.c b/module/zfs/spa.c index 5f9408dfd..139a670d4 100644 --- a/module/zfs/spa.c +++ b/module/zfs/spa.c @@ -1138,6 +1138,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: |