014c16fb1f
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-07-07 14:13:16 -07:00
34422f0ffa
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-07-07 13:50:32 -07:00
47502cd94b
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-07-07 13:50:31 -07:00
1d8ef486a8
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
2009-07-07 13:50:30 -07:00
fb26df15c8
Merge branch 'gcc-missing-braces' into refs/top-bases/gcc-branch
2009-07-07 13:50:30 -07:00
cad9fa40e1
Merge branch 'gcc-cast' into refs/top-bases/gcc-branch
2009-07-07 13:50:29 -07:00
a2423197e1
Resolve missing cast warning
2009-07-07 13:41:51 -07:00
361e0e7685
Fix newly introduced missing braces warnings for gcc.
2009-07-07 13:40:16 -07:00
621679fec6
Update to use dmu_read() instead of dmu_read_impl() now that a 'flags'
...
argument is available. This flags argument was added to allow a clean
API for disabling prefetch, so I'll update zpios to use it in preference
to the module option hack used before.
2009-07-06 16:51:59 -07:00
684a4c5f30
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-07-06 15:41:50 -07:00
69b2257940
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-07-06 15:38:51 -07:00
8463b9e01e
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
2009-07-06 15:38:50 -07:00
4272b9e492
Merge commit 'refs/top-bases/feature-branch' into feature-branch
2009-07-06 15:38:49 -07:00
1f5a1d932e
Merge branch 'feature-pthreads' into refs/top-bases/feature-branch
2009-07-06 15:38:48 -07:00
3a8e684d73
Additional lock calls were added to ztest and they must be updated
...
to use the pthread's API in favour of Solaris threads.
2009-07-06 15:31:54 -07:00
d65102b493
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-07-06 15:08:57 -07:00
658459249e
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-07-06 13:17:28 -07:00
926b04acba
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
...
Conflicts:
cmd/ztest/ztest.c
2009-07-06 13:17:16 -07:00
8d4f19348a
Merge commit 'refs/top-bases/feature-branch' into feature-branch
2009-07-06 13:16:34 -07:00
2838dba2c4
Merge branch 'feature-pthreads' into refs/top-bases/feature-branch
2009-07-06 13:16:32 -07:00
cd098f87c8
Merge commit 'refs/top-bases/feature-pthreads' into feature-pthreads
...
Conflicts:
cmd/ztest/ztest.c
2009-07-06 13:16:29 -07:00
8795d8f034
Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb
2009-07-06 13:15:43 -07:00
95ba24ed69
Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch
...
Conflicts:
cmd/ztest/ztest.c
2009-07-06 13:15:35 -07:00
d369760713
Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key
2009-07-06 13:14:41 -07:00
4e59805d98
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2009-07-06 13:14:36 -07:00
4ac493854e
Merge commit 'refs/top-bases/fix-branch' into fix-branch
2009-07-06 13:14:20 -07:00
1851e0622f
Merge branch 'fix-deadcode' into refs/top-bases/fix-branch
2009-07-06 13:14:18 -07:00
f6c61972e1
Merge commit 'refs/top-bases/fix-deadcode' into fix-deadcode
2009-07-06 13:14:18 -07:00
ab14c47f14
Merge branch 'fix-strncat' into refs/top-bases/fix-branch
2009-07-06 13:14:13 -07:00
4de6678930
Merge commit 'refs/top-bases/fix-strncat' into fix-strncat
2009-07-06 13:14:13 -07:00
5ab66031b7
Merge branch 'fix-list' into refs/top-bases/fix-branch
2009-07-06 13:14:08 -07:00
b21412b008
Merge commit 'refs/top-bases/fix-list' into fix-list
...
Conflicts:
module/zfs/zil.c
2009-07-06 13:14:05 -07:00
02edd0ffc1
Merge branch 'fix-taskq' into refs/top-bases/fix-branch
2009-07-06 13:13:25 -07:00
4539acb1cd
Merge commit 'refs/top-bases/fix-taskq' into fix-taskq
2009-07-06 13:13:25 -07:00
c186eae4b9
Merge branch 'fix-stack' into refs/top-bases/fix-branch
2009-07-06 13:13:20 -07:00
326bb586bd
Merge commit 'refs/top-bases/fix-stack' into fix-stack
2009-07-06 13:13:20 -07:00
4749932f63
Merge branch 'fix-rwlocks' into refs/top-bases/fix-branch
2009-07-06 13:13:15 -07:00
a1e0f402bf
Merge commit 'refs/top-bases/fix-rwlocks' into fix-rwlocks
2009-07-06 13:13:14 -07:00
ac96ab67ed
Merge branch 'fix-no-zmod' into refs/top-bases/fix-branch
2009-07-06 13:13:05 -07:00
f3dc6d4e58
Merge commit 'refs/top-bases/fix-no-zmod' into fix-no-zmod
2009-07-06 13:13:05 -07:00
6f31ab380c
Merge branch 'fix-newlines' into refs/top-bases/fix-branch
2009-07-06 13:12:59 -07:00
9f1627af07
Merge commit 'refs/top-bases/fix-newlines' into fix-newlines
2009-07-06 13:12:59 -07:00
ea95d72db5
Merge branch 'fix-get-configs' into refs/top-bases/fix-branch
2009-07-06 13:12:54 -07:00
e320858042
Merge commit 'refs/top-bases/fix-get-configs' into fix-get-configs
2009-07-06 13:12:54 -07:00
afaf8092eb
Merge branch 'fix-evict-dbufs' into refs/top-bases/fix-branch
2009-07-06 13:12:49 -07:00
2c4280a680
Merge commit 'refs/top-bases/fix-evict-dbufs' into fix-evict-dbufs
2009-07-06 13:12:49 -07:00
4bf249a931
Merge branch 'fix-dsl_pool_t' into refs/top-bases/fix-branch
2009-07-06 13:12:44 -07:00
eaba5df9af
Merge commit 'refs/top-bases/fix-dsl_pool_t' into fix-dsl_pool_t
2009-07-06 13:12:44 -07:00
021d679b95
Merge branch 'fix-dnode-cons' into refs/top-bases/fix-branch
2009-07-06 13:12:39 -07:00
75b6de8e83
Merge commit 'refs/top-bases/fix-dnode-cons' into fix-dnode-cons
2009-07-06 13:12:39 -07:00
Brian Behlendorf