Skip to content

Commit

Permalink
7495 loader should boot pre-feature flags pools.
Browse files Browse the repository at this point in the history
Reviewed by: Andrew Stormont <astormont@racktopsystems.com>
Reviewed by: Paul Dagnelie <pcd@delphix.com>
Approved by: Matthew Ahrens <mahrens@delphix.com>
  • Loading branch information
tsoome authored and ahrens committed Oct 27, 2016
1 parent 87aa58a commit 5e069aa
Showing 1 changed file with 9 additions and 1 deletion.
10 changes: 9 additions & 1 deletion usr/src/boot/sys/boot/zfs/zfsimpl.c
Expand Up @@ -2079,8 +2079,16 @@ check_mos_features(const spa_t *spa)
if ((rc = objset_get_dnode(spa, &spa->spa_mos, DMU_OT_OBJECT_DIRECTORY,
&dir)) != 0)
return (rc);
if ((rc = zap_lookup(spa, &dir, DMU_POOL_FEATURES_FOR_READ, &objnum)) != 0)
if ((rc = zap_lookup(spa, &dir, DMU_POOL_FEATURES_FOR_READ,
&objnum)) != 0) {
/*
* It is older pool without features. As we have already
* tested the label, just return without raising the error.
*/
if (rc == ENOENT)
rc = 0;
return (rc);
}

if ((rc = objset_get_dnode(spa, &spa->spa_mos, objnum, &dir)) != 0)
return (rc);
Expand Down

0 comments on commit 5e069aa

Please sign in to comment.