c77ce6cb93
Merge commit 'refs/top-bases/fix-strncat' into fix-strncat
2009-08-18 12:10:12 -07:00
0d46ebf0ff
Merge branch 'fix-list' into refs/top-bases/fix-branch
2009-08-18 12:10:08 -07:00
ae5bc5970d
Merge commit 'refs/top-bases/fix-list' into fix-list
2009-08-18 12:10:07 -07:00
8a8490b570
Merge branch 'fix-taskq' into refs/top-bases/fix-branch
2009-08-18 12:10:03 -07:00
e20ba40c91
Merge commit 'refs/top-bases/fix-taskq' into fix-taskq
2009-08-18 12:10:02 -07:00
12c361b1a1
Merge branch 'fix-stack' into refs/top-bases/fix-branch
2009-08-18 12:09:58 -07:00
f8cca2b295
Merge commit 'refs/top-bases/fix-stack' into fix-stack
2009-08-18 12:09:57 -07:00
0911c7f7c3
Merge branch 'fix-rwlocks' into refs/top-bases/fix-branch
2009-08-18 12:09:53 -07:00
169f50db79
Merge commit 'refs/top-bases/fix-rwlocks' into fix-rwlocks
2009-08-18 12:09:52 -07:00
0ec64690ba
Merge branch 'fix-no-zmod' into refs/top-bases/fix-branch
2009-08-18 12:09:47 -07:00
abe9fefd9b
Merge commit 'refs/top-bases/fix-no-zmod' into fix-no-zmod
2009-08-18 12:09:46 -07:00
3454bd3d24
Merge branch 'fix-newlines' into refs/top-bases/fix-branch
2009-08-18 12:09:42 -07:00
e8791794b6
Merge commit 'refs/top-bases/fix-newlines' into fix-newlines
2009-08-18 12:09:41 -07:00
3eadb69629
Merge branch 'fix-get-configs' into refs/top-bases/fix-branch
2009-08-18 12:09:37 -07:00
b3ea816a68
Merge commit 'refs/top-bases/fix-get-configs' into fix-get-configs
2009-08-18 12:09:36 -07:00
170144c78f
Merge branch 'fix-evict-dbufs' into refs/top-bases/fix-branch
2009-08-18 12:09:32 -07:00
b8667c4859
Merge commit 'refs/top-bases/fix-evict-dbufs' into fix-evict-dbufs
2009-08-18 12:09:31 -07:00
1222979fd0
Merge branch 'fix-dsl_pool_t' into refs/top-bases/fix-branch
2009-08-18 12:09:27 -07:00
e7c05295ca
Merge commit 'refs/top-bases/fix-dsl_pool_t' into fix-dsl_pool_t
2009-08-18 12:09:26 -07:00
78c9472f02
Merge branch 'fix-dnode-cons' into refs/top-bases/fix-branch
2009-08-18 12:09:22 -07:00
e7334931f1
Merge commit 'refs/top-bases/fix-dnode-cons' into fix-dnode-cons
2009-08-18 12:09:21 -07:00
35402a2780
Merge branch 'fix-dbuf_dirty_record_t' into refs/top-bases/fix-branch
2009-08-18 12:09:16 -07:00
b330ab77df
Merge commit 'refs/top-bases/fix-dbuf_dirty_record_t' into fix-dbuf_dirty_record_t
2009-08-18 12:09:14 -07:00
d205b25a74
Merge branch 'fix-clock-wrap' into refs/top-bases/fix-branch
2009-08-18 12:09:10 -07:00
25ddaec292
Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap
2009-08-18 12:09:07 -07:00
45d1cae3b8
Rebase master to b121
2009-08-18 11:43:27 -07:00
653cd5153a
Merge branch 'fix-stack' into refs/top-bases/fix-branch
2009-07-29 21:27:10 -07:00
ee435f260c
Excessively large stack frames detected.
...
The 2.6.30 kernel build systems sets -Wframe-larger-than=2048 which causes
a warning to be generated when an individual stack frame exceeds 2048.
This caught the spa_history_log() and dmu_objset_snapshot() functions
which declared a data structure on the stack which contained a char
array of MAXPATHLEN. This in defined to be 4096 in the linux kernel
and I imagine it is quite large under Solaris as well. Regardless, the
offending data structures were moved to the heap to correctly keep the
stack depth to a minimum. We might consider setting this value even
lower to catch additional offenders because we are expecting deep stacks.
2009-07-29 21:18:48 -07:00
e4610d7991
Merge branch 'fix-get-configs' into refs/top-bases/fix-branch
2009-07-24 09:15:53 -07:00
1b4dfb80fb
Increase buffer size for nvlist for large configurations
...
It's still not clear to me why the default value here is large
enough Solaris. I hit this limit again when setting up 120 SATA
drives configured as 15 raidz2 groups each containing 8 drives.
We expect to go bigger so we may just want to spend a little
time and figure out how to make this all dynamic.
2009-07-24 08:53:18 -07:00
ed3bd6f446
Merge branch 'fix-acl' into refs/top-bases/fix-branch
2009-07-07 14:19:35 -07:00
798cf63309
New topic branch for minor acl related fixes
2009-07-07 14:18:47 -07:00
f6c61972e1
Merge commit 'refs/top-bases/fix-deadcode' into fix-deadcode
2009-07-06 13:14:18 -07:00
1851e0622f
Merge branch 'fix-deadcode' into refs/top-bases/fix-branch
2009-07-06 13:14:18 -07:00
4de6678930
Merge commit 'refs/top-bases/fix-strncat' into fix-strncat
2009-07-06 13:14:13 -07:00
ab14c47f14
Merge branch 'fix-strncat' into refs/top-bases/fix-branch
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
4539acb1cd
Merge commit 'refs/top-bases/fix-taskq' into fix-taskq
2009-07-06 13:13:25 -07:00
02edd0ffc1
Merge branch 'fix-taskq' into refs/top-bases/fix-branch
2009-07-06 13:13:25 -07:00
326bb586bd
Merge commit 'refs/top-bases/fix-stack' into fix-stack
2009-07-06 13:13:20 -07:00
c186eae4b9
Merge branch 'fix-stack' into refs/top-bases/fix-branch
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
f3dc6d4e58
Merge commit 'refs/top-bases/fix-no-zmod' into fix-no-zmod
2009-07-06 13:13:05 -07:00
ac96ab67ed
Merge branch 'fix-no-zmod' into refs/top-bases/fix-branch
2009-07-06 13:13:05 -07:00
9f1627af07
Merge commit 'refs/top-bases/fix-newlines' into fix-newlines
2009-07-06 13:12:59 -07:00
6f31ab380c
Merge branch 'fix-newlines' into refs/top-bases/fix-branch
2009-07-06 13:12:59 -07:00
e320858042
Merge commit 'refs/top-bases/fix-get-configs' into fix-get-configs
2009-07-06 13:12:54 -07:00
ea95d72db5
Merge branch 'fix-get-configs' into refs/top-bases/fix-branch
2009-07-06 13:12:54 -07:00
Brian Behlendorf