Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent

This commit is contained in:
Brian Behlendorf 2009-07-07 16:32:00 -07:00
parent aab811ea53 0a00d10c24
commit 0dc735a580
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
module/zfs/metaslab.c
View File

@ -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)); return (metaslab_block_picker(t, cursor, size, align));
} }
#if 0
/* /*
* ========================================================================== * ==========================================================================
* The first-fit block allocator * The first-fit block allocator
@ -310,6 +311,7 @@ static space_map_ops_t metaslab_ff_ops = {
metaslab_ff_free, metaslab_ff_free,
NULL /* maxsize */ NULL /* maxsize */
}; };
#endif
/* /*
* Dynamic block allocator - * Dynamic block allocator -

2
module/zfs/spa.c
View File

@ -1138,6 +1138,8 @@ int
spa_check_logs(spa_t *spa) spa_check_logs(spa_t *spa)
{ {
switch (spa->spa_log_state) { switch (spa->spa_log_state) {
default:
break;
case SPA_LOG_MISSING: case SPA_LOG_MISSING:
/* need to recheck in case slog has been restored */ /* need to recheck in case slog has been restored */
case SPA_LOG_UNKNOWN: case SPA_LOG_UNKNOWN: