Permalink
Browse files

Update to onnv_147

This is the last official OpenSolaris tag before the public
development tree was closed.
  • Loading branch information...
behlendorf committed Aug 26, 2010
1 parent 1980602 commit 572e285762521df27fe5b026f409ba1a21abb7ac
Showing with 7,810 additions and 2,423 deletions.
  1. +1 −1 ZFS.RELEASE
  2. +18 −11 cmd/zdb/zdb.c
  3. +305 −296 cmd/zfs/zfs_main.c
  4. +2 −2 cmd/zinject/translate.c
  5. +17 −7 cmd/zinject/zinject.c
  6. +58 −20 cmd/zpool/zpool_main.c
  7. +46 −37 cmd/ztest/ztest.c
  8. +3 −6 lib/libefi/include/sys/efi_partition.h
  9. +3 −4 lib/libefi/rdwr_efi.c
  10. +153 −6 lib/libnvpair/include/libnvpair.h
  11. +566 −64 lib/libnvpair/libnvpair.c
  12. +11 −2 lib/libuutil/include/libuutil.h
  13. +39 −2 lib/libuutil/uu_alloc.c
  14. +29 −4 lib/libuutil/uu_misc.c
  15. +56 −0 lib/libuutil/uu_string.c
  16. +25 −7 lib/libzfs/include/libzfs.h
  17. +6 −2 lib/libzfs/include/libzfs_impl.h
  18. +68 −155 lib/libzfs/libzfs_dataset.c
  19. +826 −0 lib/libzfs/libzfs_diff.c
  20. +12 −2 lib/libzfs/libzfs_import.c
  21. +41 −43 lib/libzfs/libzfs_mount.c
  22. +159 −103 lib/libzfs/libzfs_pool.c
  23. +138 −76 lib/libzfs/libzfs_sendrecv.c
  24. +39 −10 lib/libzfs/libzfs_util.c
  25. +18 −4 lib/libzpool/include/sys/zfs_context.h
  26. +37 −2 lib/libzpool/kernel.c
  27. +3 −2 module/nvpair/include/sys/nvpair.h
  28. +7 −2 module/nvpair/nvpair.c
  29. +26 −3 module/zcommon/include/sys/fs/zfs.h
  30. +2 −2 module/zcommon/include/zfs_deleg.h
  31. +2 −2 module/zcommon/zfs_deleg.c
  32. +3 −2 module/zcommon/zpool_prop.c
  33. +36 −19 module/zfs/arc.c
  34. +42 −9 module/zfs/bpobj.c
  35. +239 −80 module/zfs/dbuf.c
  36. +17 −11 module/zfs/ddt.c
  37. +157 −54 module/zfs/dmu.c
  38. +221 −0 module/zfs/dmu_diff.c
  39. +3 −3 module/zfs/dmu_object.c
  40. +194 −82 module/zfs/dmu_objset.c
  41. +64 −29 module/zfs/dmu_send.c
  42. +40 −29 module/zfs/dmu_traverse.c
  43. +27 −8 module/zfs/dmu_tx.c
  44. +510 −55 module/zfs/dnode.c
  45. +25 −9 module/zfs/dnode_sync.c
  46. +186 −66 module/zfs/dsl_dataset.c
  47. +20 −14 module/zfs/dsl_deleg.c
  48. +3 −3 module/zfs/dsl_pool.c
  49. +40 −13 module/zfs/dsl_scan.c
  50. +5 −0 module/zfs/dsl_synctask.c
  51. +15 −1 module/zfs/fm.c
  52. +41 −19 module/zfs/include/sys/dbuf.h
  53. +8 −3 module/zfs/include/sys/dmu.h
  54. +20 −5 module/zfs/include/sys/dmu_objset.h
  55. +3 −0 module/zfs/include/sys/dmu_traverse.h
  56. +28 −3 module/zfs/include/sys/dnode.h
  57. +23 −2 module/zfs/include/sys/dsl_dataset.h
  58. +3 −2 module/zfs/include/sys/dsl_deleg.h
  59. +30 −1 module/zfs/include/sys/fm/protocol.h
  60. +2 −4 module/zfs/include/sys/fm/util.h
  61. +4 −3 module/zfs/include/sys/refcount.h
  62. +2 −3 module/zfs/include/sys/sa.h
  63. +2 −3 module/zfs/include/sys/sa_impl.h
  64. +3 −3 module/zfs/include/sys/spa.h
  65. +4 −2 module/zfs/include/sys/spa_impl.h
  66. +2 −0 module/zfs/include/sys/vdev_impl.h
  67. +1 −5 module/zfs/include/sys/zfs_acl.h
  68. +49 −4 module/zfs/include/sys/zfs_ioctl.h
  69. +66 −0 module/zfs/include/sys/zfs_onexit.h
  70. +56 −0 module/zfs/include/sys/zfs_stat.h
  71. +1 −0 module/zfs/include/sys/zfs_vfsops.h
  72. +9 −6 module/zfs/include/sys/zfs_znode.h
  73. +6 −9 module/zfs/include/sys/zil.h
  74. +27 −4 module/zfs/include/sys/zil_impl.h
  75. +1 −1 module/zfs/include/sys/zio.h
  76. +66 −0 module/zfs/include/sys/zrlock.h
  77. +4 −5 module/zfs/lzjb.c
  78. +33 −2 module/zfs/refcount.c
  79. +151 −67 module/zfs/sa.c
  80. +368 −151 module/zfs/spa.c
  81. +1 −22 module/zfs/spa_config.c
  82. +19 −10 module/zfs/spa_misc.c
  83. +1 −1 module/zfs/txg.c
  84. +57 −29 module/zfs/vdev.c
  85. +12 −0 module/zfs/vdev_label.c
  86. +119 −96 module/zfs/zfs_acl.c
  87. +4 −3 module/zfs/zfs_ctldir.c
  88. +8 −2 module/zfs/zfs_dir.c
  89. +2 −20 module/zfs/zfs_fuid.c
  90. +656 −147 module/zfs/zfs_ioctl.c
  91. +22 −37 module/zfs/zfs_log.c
  92. +246 −0 module/zfs/zfs_onexit.c
  93. +44 −17 module/zfs/zfs_replay.c
  94. +28 −6 module/zfs/zfs_sa.c
  95. +26 −26 module/zfs/zfs_vfsops.c
  96. +135 −63 module/zfs/zfs_vnops.c
  97. +209 −69 module/zfs/zfs_znode.c
  98. +421 −194 module/zfs/zil.c
  99. +22 −1 module/zfs/zio.c
  100. +8 −9 module/zfs/zio_inject.c
  101. +194 −0 module/zfs/zrlock.c
View
@@ -1 +1 @@
-ssh://anon@hg.opensolaris.org/hg/onnv/onnv-gate/onnv_141
+ssh://anon@hg.opensolaris.org/hg/onnv/onnv-gate/onnv_147
View
@@ -695,12 +695,12 @@ dump_ddt(ddt_t *ddt, enum ddt_type type, enum ddt_class class)
return;
ASSERT(error == 0);
- count = ddt_object_count(ddt, type, class);
+ if ((count = ddt_object_count(ddt, type, class)) == 0)
+ return;
+
dspace = doi.doi_physical_blocks_512 << 9;
mspace = doi.doi_fill_count * doi.doi_data_block_size;
- ASSERT(count != 0); /* we should have destroyed it */
-
ddt_object_name(ddt, type, class, name);
(void) printf("%s: %llu entries, size %llu on disk, %llu in core\n",
@@ -1290,8 +1290,12 @@ dump_znode(objset_t *os, uint64_t object, void *data, size_t size)
VERIFY(zap_lookup(os, MASTER_NODE_OBJ, ZFS_SA_ATTRS,
8, 1, &sa_attrs) == 0);
}
- sa_attr_table = sa_setup(os, sa_attrs,
- zfs_attr_table, ZPL_END);
+ if ((error = sa_setup(os, sa_attrs, zfs_attr_table,
+ ZPL_END, &sa_attr_table)) != 0) {
+ (void) printf("sa_setup failed errno %d, can't "
+ "display znode contents\n", error);
+ return;
+ }
sa_loaded = B_TRUE;
}
@@ -1455,15 +1459,15 @@ dump_object(objset_t *os, uint64_t object, int verbosity, int *print_header)
}
if (object == 0) {
- dn = os->os_meta_dnode;
+ dn = DMU_META_DNODE(os);
} else {
error = dmu_bonus_hold(os, object, FTAG, &db);
if (error)
fatal("dmu_bonus_hold(%llu) failed, errno %u",
object, error);
bonus = db->db_data;
bsize = db->db_size;
- dn = ((dmu_buf_impl_t *)db)->db_dnode;
+ dn = DB_DNODE((dmu_buf_impl_t *)db);
}
dmu_object_info_from_dnode(dn, &doi);
@@ -1627,8 +1631,8 @@ dump_dir(objset_t *os)
dump_object(os, 0, verbosity, &print_header);
object_count = 0;
- if (os->os_userused_dnode &&
- os->os_userused_dnode->dn_type != 0) {
+ if (DMU_USERUSED_DNODE(os) != NULL &&
+ DMU_USERUSED_DNODE(os)->dn_type != 0) {
dump_object(os, DMU_USERUSED_OBJECT, verbosity, &print_header);
dump_object(os, DMU_GROUPUSED_OBJECT, verbosity, &print_header);
}
@@ -3072,8 +3076,11 @@ main(int argc, char **argv)
fatal("can't open '%s': %s",
target, strerror(ENOMEM));
}
- if ((error = spa_import(name, cfg, NULL)) != 0)
- error = spa_import_verbatim(name, cfg, NULL);
+ if ((error = spa_import(name, cfg, NULL,
+ ZFS_IMPORT_MISSING_LOG)) != 0) {
+ error = spa_import(name, cfg, NULL,
+ ZFS_IMPORT_VERBATIM);
+ }
}
}
Oops, something went wrong.

0 comments on commit 572e285

Please sign in to comment.