888b72c614
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
2010-06-28 10:37:29 -07:00
5a80c173cd
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2010-06-28 10:37:27 -07:00
d3c37d45e6
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2010-06-28 10:37:21 -07:00
2a2492e105
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2010-06-28 10:37:19 -07:00
c227476f72
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2010-06-28 10:37:13 -07:00
9e841db04c
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2010-06-28 10:37:11 -07:00
ce981e8b1f
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
2010-06-28 10:37:05 -07:00
37e52074e8
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2010-06-28 10:37:03 -07:00
bc70b08afa
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
2010-06-28 10:36:57 -07:00
235abcb965
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2010-06-28 10:36:55 -07:00
0fc35eb24e
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
2010-06-28 10:36:49 -07:00
6107ded5d5
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2010-06-28 10:36:47 -07:00
07eb43b53a
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2010-06-28 10:36:41 -07:00
a6411d4033
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2010-06-28 10:36:38 -07:00
c11253760f
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
2010-06-28 10:36:33 -07:00
03eab0c703
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2010-06-28 10:36:30 -07:00
712dbf737f
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2010-06-28 10:36:24 -07:00
cecd65c15b
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
2010-06-28 10:36:21 -07:00
744af7fa00
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2010-06-28 10:36:20 -07:00
191d5e833a
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2010-06-28 10:36:19 -07:00
e8eea67f41
Merge commit 'refs/top-bases/fix-branch' into fix-branch
2010-06-28 10:36:18 -07:00
8ec85f8aee
Merge branch 'fix-stack-dmu_objset_snapshot' into refs/top-bases/fix-branch
2010-06-28 10:36:17 -07:00
ee53c67258
Merge branch 'fix-pthreads' into refs/top-bases/fix-branch
2010-06-28 10:36:17 -07:00
1a967e146f
Merge branch 'fix-taskq' into refs/top-bases/fix-branch
2010-06-28 10:36:16 -07:00
df8d7829a8
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2010-06-28 10:36:13 -07:00
af239500df
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
2010-06-28 10:36:12 -07:00
ef3ec1c9ed
Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch
2010-06-28 10:36:11 -07:00
52bb0d8e75
Ensure zio_bad_cksum_t is initialized
...
This may not strictly be needed but it does keep gcc happy. We
should keep our eye on this though if the extra bcopy significantly
impacts performance. It may.
2010-06-28 10:30:38 -07:00
94f23a6856
Ensure NULL is not returned incorrectly after the first call.
...
I'm surprised this was not caught long ago, but previous the
code actually never did call the function twice so it was
missed. Anyway, this fixes it.
2010-06-28 10:27:18 -07:00
5b1f2041e5
Silence 3 additional large kmem warnings
...
The following are 3 cases where move than 2 pages are allocated
with a kmem_alloc()... but not a lot more. For now we just disable
the warning with KM_NODEBUG and this can be revisted latter to
see if it's worth shrinking the allocation or perhaps moving it
to a slab.
2010-06-28 10:23:42 -07:00
d6ea5e8cef
Additional ZVOL cleanup in zvol_set_volsize()
...
The following cleanup was missed in the first pass when the ZVOL
implementation was updated. An extra instance of a zvol_state_t
was removed from the stack and the error handling was simplified.
2010-06-28 10:21:24 -07:00
a2e73b7516
Allow joinable threads
...
There was previous discussion of a race with joinable threads but to
be honest I can neither exactly remember the race, or recrease the
issue. I believe it may have had to do with pthread_create() returning
without having set kt->tid since this was done in the created thread.
If that was the race then I've 'fixed' it by ensuring the thread id
is set in the thread AND as the first pthread_create() argument. Why
this wasn't done originally I'm not sure, with luck Ricardo remembers.
Additionally, explicitly set a PAGESIZE guard frame at the end of the
stack to aid in detecting stack overflow. And add some conditional
logic to set STACK_SIZE correctly for Solaris.
2010-06-28 10:15:29 -07:00
6914386b85
Never sleep under taskq_dispatch()
...
There are cases where under Linux it is not safe to sleep in
taskq_dispatch(). Rather than adding Linux specific code to
detect these cases I opted to keep it simple and just never
allow a sleep here. The impact of this should be minimal.
2010-06-28 10:11:12 -07:00
0c11631b02
Fix for fix-stack-dmu_objset_snapshot should be 'sn' not '&sn'
...
I missed a instanse of removing the & operator when reducing the
stack usage in this function. This unfortunately doesn't cause
a compile warning but it is does cause ztest failures. Anyway,
update the topic branch to correct this mistake.
2010-06-28 10:06:29 -07:00
e780aad257
Merge branch 'linux-debug-zerocopy' into refs/top-bases/linux-zfs-branch
2010-06-21 22:01:57 -07:00
06376e3a0e
Revert linux-debug-zerocopy real ZC support added
2010-06-21 21:39:06 -07:00
79bd363c46
Merge branch 'linux-spa-thread' into refs/top-bases/linux-zfs-branch
2010-06-16 14:49:50 -07:00
6759fc28bd
Merge commit 'refs/top-bases/linux-spa-thread' into linux-spa-thread
2010-06-16 14:49:48 -07:00
f7b27e6f38
Merge branch 'linux-topology' into refs/top-bases/linux-zfs-branch
2010-06-16 14:45:28 -07:00
5f9e681ed5
Merge commit 'refs/top-bases/linux-topology' into linux-topology
2010-06-16 14:45:25 -07:00
9930154cb1
Merge branch 'linux-sha2' into refs/top-bases/linux-zfs-branch
2010-06-16 14:45:20 -07:00
eb8180eff5
Merge commit 'refs/top-bases/linux-sha2' into linux-sha2
2010-06-16 14:45:18 -07:00
8071102c13
Merge branch 'linux-user-util' into refs/top-bases/linux-zfs-branch
2010-06-16 14:45:12 -07:00
57109ced6c
Merge commit 'refs/top-bases/linux-user-util' into linux-user-util
2010-06-16 14:45:10 -07:00
b354563ed6
Merge branch 'linux-debug-zerocopy' into refs/top-bases/linux-zfs-branch
2010-06-16 14:45:05 -07:00
53e9660c56
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2010-06-16 14:45:03 -07:00
5cac48ae66
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2010-06-16 14:45:02 -07:00
35ecd5a496
Merge branch 'linux-events' into refs/top-bases/linux-zfs-branch
2010-06-16 14:44:52 -07:00
5a46abc9a0
Merge commit 'refs/top-bases/linux-events' into linux-events
2010-06-16 14:44:50 -07:00
f254c7982b
Merge branch 'linux-kernel-device' into refs/top-bases/linux-zfs-branch
2010-06-16 14:44:45 -07:00
Brian Behlendorf