diff options
| author | Keith M Wesolowski <wesolows@foobazco.org> | 2013-10-08 20:35:11 +0000 |
|---|---|---|
| committer | Keith M Wesolowski <wesolows@foobazco.org> | 2013-10-08 20:35:23 +0000 |
| commit | 8dabb8c07d158527e4563c519087b92df1f48969 (patch) | |
| tree | cdf8b43cad8d99f0d14d5a6d48a17e2199843e18 /usr/src/grub | |
| parent | 0c3e53c3a25115a415f4ee6f6d02e7a0a285a676 (diff) | |
| parent | 2acef22db7808606888f8f92715629ff3ba555b9 (diff) | |
| download | illumos-joyent-8dabb8c07d158527e4563c519087b92df1f48969.tar.gz | |
[illumos-gate merge]
commit 2acef22db7808606888f8f92715629ff3ba555b9
4171 clean up spa_feature_*() interfaces
4172 implement extensible_dataset feature for use by other zpool features
commit 018d3f06fe63d3b8316ef73502fb8f2dd473ffd1
3195 mpt_sas IOC reset races can cause panics
Conflicts:
usr/src/common/zfs/zfeature_common.h (preserve FS_SS_LIMIT)
Diffstat (limited to 'usr/src/grub')
| -rw-r--r-- | usr/src/grub/grub-0.97/stage2/fsys_zfs.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/usr/src/grub/grub-0.97/stage2/fsys_zfs.c b/usr/src/grub/grub-0.97/stage2/fsys_zfs.c index 881ef3fead..8a3b177443 100644 --- a/usr/src/grub/grub-0.97/stage2/fsys_zfs.c +++ b/usr/src/grub/grub-0.97/stage2/fsys_zfs.c @@ -23,7 +23,7 @@ */ /* - * Copyright (c) 2012 by Delphix. All rights reserved. + * Copyright (c) 2013 by Delphix. All rights reserved. * Copyright (c) 2013 by Saso Kiselkov. All rights reserved. */ @@ -966,6 +966,7 @@ get_default_bootfsobj(dnode_phys_t *mosmdn, uint64_t *obj, char *stack) */ static const char *spa_feature_names[] = { "org.illumos:lz4_compress", + "com.delphix:extensible_dataset", NULL }; @@ -1044,7 +1045,7 @@ get_objset_mdn(dnode_phys_t *mosmdn, char *fsname, uint64_t *obj, stack)) return (errnum); - if (errnum = dnode_get(mosmdn, objnum, DMU_OT_DSL_DIR, mdn, stack)) + if (errnum = dnode_get(mosmdn, objnum, 0, mdn, stack)) return (errnum); if (fsname == NULL) { @@ -1086,7 +1087,7 @@ get_objset_mdn(dnode_phys_t *mosmdn, char *fsname, uint64_t *obj, if (zap_lookup(mdn, cname, &objnum, stack)) return (ERR_FILESYSTEM_NOT_FOUND); - if (errnum = dnode_get(mosmdn, objnum, DMU_OT_DSL_DIR, + if (errnum = dnode_get(mosmdn, objnum, 0, mdn, stack)) return (errnum); @@ -1099,7 +1100,7 @@ get_objset_mdn(dnode_phys_t *mosmdn, char *fsname, uint64_t *obj, *obj = headobj; skip: - if (errnum = dnode_get(mosmdn, headobj, DMU_OT_DSL_DATASET, mdn, stack)) + if (errnum = dnode_get(mosmdn, headobj, 0, mdn, stack)) return (errnum); if (issnapshot) { uint64_t snapobj; @@ -1112,8 +1113,7 @@ skip: return (errnum); if (zap_lookup(mdn, snapname + 1, &headobj, stack)) return (ERR_FILESYSTEM_NOT_FOUND); - if (errnum = dnode_get(mosmdn, headobj, - DMU_OT_DSL_DATASET, mdn, stack)) + if (errnum = dnode_get(mosmdn, headobj, 0, mdn, stack)) return (errnum); if (obj) *obj = headobj; |