Commit Graph

935 Commits

Author SHA1 Message Date
Brian Behlendorf a69d02c405 Merge branch 'fix-evict-dbufs' into refs/top-bases/fix-branch 2009-01-15 14:13:52 -08:00
Brian Behlendorf 6d0be909c8 Merge commit 'refs/top-bases/fix-evict-dbufs' into fix-evict-dbufs 2009-01-15 14:13:51 -08:00
Brian Behlendorf a378243d07 Merge commit 'refs/top-bases/fix-dsl_pool_t' into fix-dsl_pool_t 2009-01-15 14:13:49 -08:00
Brian Behlendorf 6e3c742027 Merge branch 'fix-dsl_pool_t' into refs/top-bases/fix-branch 2009-01-15 14:13:49 -08:00
Brian Behlendorf d558d8818e Merge branch 'fix-dnode-cons' into refs/top-bases/fix-branch 2009-01-15 14:13:47 -08:00
Brian Behlendorf 216ce72418 Merge commit 'refs/top-bases/fix-dnode-cons' into fix-dnode-cons 2009-01-15 14:13:46 -08:00
Brian Behlendorf 973c927422 Merge branch 'fix-dbuf_dirty_record_t' into refs/top-bases/fix-branch 2009-01-15 14:13:44 -08:00
Brian Behlendorf 2e35cc0802 Merge commit 'refs/top-bases/fix-dbuf_dirty_record_t' into fix-dbuf_dirty_record_t 2009-01-15 14:13:43 -08:00
Brian Behlendorf 551838a6c8 Resolve conflict with removed cleaner type 2009-01-15 14:13:39 -08:00
Brian Behlendorf b633e4f669 Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap 2009-01-15 14:11:26 -08:00
Brian Behlendorf fb5f0bc833 Rebase master to b105 2009-01-15 13:59:39 -08:00
Brian Behlendorf a7e8d5a15a Merge branch 'fix-list' into refs/top-bases/fix-branch 2009-01-14 13:45:30 -08:00
Brian Behlendorf 95576ca7a8 Update topmsg 2009-01-14 13:41:28 -08:00
Brian Behlendorf e1632568f1 Merge branch 'fix-list' into refs/top-bases/fix-branch 2009-01-13 16:06:23 -08:00
Brian Behlendorf be0b4029db Initialize list links 2009-01-13 16:02:19 -08:00
Brian Behlendorf 43cd437415 Merge branch 'fix-list' into refs/top-bases/fix-branch 2009-01-13 15:33:59 -08:00
Brian Behlendorf 94944fab96 Fix proper list node initialization 2009-01-13 15:31:58 -08:00
Brian Behlendorf 2e9cd667d0 Merge branch 'fix-rwlocks' into refs/top-bases/fix-branch 2009-01-13 15:07:06 -08:00
Brian Behlendorf fcd2296399 Additional rw_lock not being initialized cleaned in updated code 2009-01-13 15:05:02 -08:00
Brian Behlendorf 6c96fc31e9 Merge branch 'fix-list' into refs/top-bases/fix-branch 2009-01-13 15:02:10 -08:00
Brian Behlendorf bec036636e List cleanup and use of list_node_init initializer 2009-01-13 15:00:12 -08:00
Brian Behlendorf c6f1eca44b Merge branch 'fix-list' into refs/top-bases/fix-branch 2009-01-13 14:18:09 -08:00
Brian Behlendorf 2ea04834bf Remove assertion for now 2009-01-13 14:16:11 -08:00
Brian Behlendorf d8561dd52a Merge branch 'fix-list' into refs/top-bases/fix-branch 2009-01-13 14:14:22 -08:00
Brian Behlendorf 877f035097 Add topmsg 2009-01-13 14:14:11 -08:00
Brian Behlendorf b5d83ce4f0 Merge branch 'fix-taskq' into refs/top-bases/fix-branch 2009-01-05 12:08:54 -08:00
Brian Behlendorf 5e814ba757 Merge commit 'refs/top-bases/fix-taskq' into fix-taskq 2009-01-05 12:08:53 -08:00
Brian Behlendorf 343b70ccce Merge branch 'fix-stack' into refs/top-bases/fix-branch 2009-01-05 12:08:51 -08:00
Brian Behlendorf 9e12900ee7 Merge commit 'refs/top-bases/fix-stack' into fix-stack 2009-01-05 12:08:50 -08:00
Brian Behlendorf aaaab8b859 Merge branch 'fix-rwlocks' into refs/top-bases/fix-branch 2009-01-05 12:08:47 -08:00
Brian Behlendorf c239bd53d2 Merge commit 'refs/top-bases/fix-rwlocks' into fix-rwlocks 2009-01-05 12:08:46 -08:00
Brian Behlendorf 50ae8964ac Merge branch 'fix-pthreads' into refs/top-bases/fix-branch 2009-01-05 12:08:45 -08:00
Brian Behlendorf 877bda9d38 Merge commit 'refs/top-bases/fix-pthreads' into fix-pthreads 2009-01-05 12:08:44 -08:00
Brian Behlendorf 3de3d58d01 Merge branch 'fix-no-zmod' into refs/top-bases/fix-branch 2009-01-05 12:08:42 -08:00
Brian Behlendorf 347ccb066f Merge commit 'refs/top-bases/fix-no-zmod' into fix-no-zmod 2009-01-05 12:08:41 -08:00
Brian Behlendorf 592c016da1 Merge commit 'refs/top-bases/fix-newlines' into fix-newlines 2009-01-05 12:08:39 -08:00
Brian Behlendorf cc369bb138 Merge branch 'fix-newlines' into refs/top-bases/fix-branch 2009-01-05 12:08:39 -08:00
Brian Behlendorf fba0f729de Merge branch 'fix-locks' into refs/top-bases/fix-branch 2009-01-05 12:08:37 -08:00
Brian Behlendorf 65520ad8fd Merge commit 'refs/top-bases/fix-locks' into fix-locks 2009-01-05 12:08:36 -08:00
Brian Behlendorf cd423f2698 Merge branch 'fix-get-configs' into refs/top-bases/fix-branch 2009-01-05 12:08:34 -08:00
Brian Behlendorf b3756d060d Merge commit 'refs/top-bases/fix-get-configs' into fix-get-configs 2009-01-05 12:08:33 -08:00
Brian Behlendorf 895a2cec93 Merge branch 'fix-evict-dbufs' into refs/top-bases/fix-branch 2009-01-05 12:08:31 -08:00
Brian Behlendorf 52075b4302 Merge commit 'refs/top-bases/fix-evict-dbufs' into fix-evict-dbufs 2009-01-05 12:08:30 -08:00
Brian Behlendorf df02ecf9b2 Merge branch 'fix-dsl_pool_t' into refs/top-bases/fix-branch 2009-01-05 12:08:27 -08:00
Brian Behlendorf c849b165ec Merge commit 'refs/top-bases/fix-dsl_pool_t' into fix-dsl_pool_t 2009-01-05 12:08:26 -08:00
Brian Behlendorf 60d592a4ca Merge branch 'fix-dnode-cons' into refs/top-bases/fix-branch 2009-01-05 12:08:24 -08:00
Brian Behlendorf 1bee6d83ae Merge commit 'refs/top-bases/fix-dnode-cons' into fix-dnode-cons 2009-01-05 12:08:23 -08:00
Brian Behlendorf de7568c6ae Merge branch 'fix-dbuf_dirty_record_t' into refs/top-bases/fix-branch 2009-01-05 12:08:21 -08:00
Brian Behlendorf 491e2d036a Merge commit 'refs/top-bases/fix-dbuf_dirty_record_t' into fix-dbuf_dirty_record_t 2009-01-05 12:08:20 -08:00
Brian Behlendorf 674ed5bd02 Merge branch 'fix-clock-wrap' into refs/top-bases/fix-branch 2009-01-05 12:08:18 -08:00