Brian Behlendorf
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
Brian Behlendorf
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
Brian Behlendorf
8e79f53f4d
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2010-06-21 22:19:48 -07:00
Brian Behlendorf
e7d3a29d07
Remove linux-debug-zerocopy dependency
2010-06-21 22:04:09 -07:00
Brian Behlendorf
5d16b55e68
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2010-06-21 22:02:00 -07:00
Brian Behlendorf
4a1a3825a7
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
2010-06-21 22:01:59 -07:00
Brian Behlendorf
e780aad257
Merge branch 'linux-debug-zerocopy' into refs/top-bases/linux-zfs-branch
2010-06-21 22:01:57 -07:00
Brian Behlendorf
06376e3a0e
Revert linux-debug-zerocopy real ZC support added
2010-06-21 21:39:06 -07:00
Brian Behlendorf
1ad4b4a52f
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2010-06-16 14:49:53 -07:00
Brian Behlendorf
63a73aa07b
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
2010-06-16 14:49:51 -07:00
Brian Behlendorf
79bd363c46
Merge branch 'linux-spa-thread' into refs/top-bases/linux-zfs-branch
2010-06-16 14:49:50 -07:00
Brian Behlendorf
6759fc28bd
Merge commit 'refs/top-bases/linux-spa-thread' into linux-spa-thread
2010-06-16 14:49:48 -07:00
Brian Behlendorf
e5f051eda8
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2010-06-16 14:46:14 -07:00
Brian Behlendorf
d5e4063149
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
2010-06-16 14:46:12 -07:00
Brian Behlendorf
f7b27e6f38
Merge branch 'linux-topology' into refs/top-bases/linux-zfs-branch
2010-06-16 14:45:28 -07:00
Brian Behlendorf
5f9e681ed5
Merge commit 'refs/top-bases/linux-topology' into linux-topology
2010-06-16 14:45:25 -07:00
Brian Behlendorf
9930154cb1
Merge branch 'linux-sha2' into refs/top-bases/linux-zfs-branch
2010-06-16 14:45:20 -07:00
Brian Behlendorf
eb8180eff5
Merge commit 'refs/top-bases/linux-sha2' into linux-sha2
2010-06-16 14:45:18 -07:00
Brian Behlendorf
8071102c13
Merge branch 'linux-user-util' into refs/top-bases/linux-zfs-branch
2010-06-16 14:45:12 -07:00
Brian Behlendorf
57109ced6c
Merge commit 'refs/top-bases/linux-user-util' into linux-user-util
2010-06-16 14:45:10 -07:00
Brian Behlendorf
b354563ed6
Merge branch 'linux-debug-zerocopy' into refs/top-bases/linux-zfs-branch
2010-06-16 14:45:05 -07:00
Brian Behlendorf
53e9660c56
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2010-06-16 14:45:03 -07:00
Brian Behlendorf
5cac48ae66
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2010-06-16 14:45:02 -07:00
Brian Behlendorf
35ecd5a496
Merge branch 'linux-events' into refs/top-bases/linux-zfs-branch
2010-06-16 14:44:52 -07:00
Brian Behlendorf
5a46abc9a0
Merge commit 'refs/top-bases/linux-events' into linux-events
2010-06-16 14:44:50 -07:00
Brian Behlendorf
f254c7982b
Merge branch 'linux-kernel-device' into refs/top-bases/linux-zfs-branch
2010-06-16 14:44:45 -07:00
Brian Behlendorf
18ead3a526
Merge commit 'refs/top-bases/linux-kernel-device' into linux-kernel-device
2010-06-16 14:44:43 -07:00
Brian Behlendorf
502ec26405
Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch
2010-06-16 14:44:37 -07:00
Brian Behlendorf
b5e1e3ade4
Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap
2010-06-16 14:44:35 -07:00
Brian Behlendorf
58dcc97a9a
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
2010-06-16 14:44:30 -07:00
Brian Behlendorf
a90a714a54
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2010-06-16 14:44:28 -07:00
Brian Behlendorf
9c0e5c2031
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
2010-06-16 14:44:23 -07:00
Brian Behlendorf
e1e1910155
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2010-06-16 14:44:21 -07:00
Brian Behlendorf
6b4c942750
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2010-06-16 14:44:15 -07:00
Brian Behlendorf
c153a79adc
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2010-06-16 14:44:13 -07:00
Brian Behlendorf
098a212ea3
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2010-06-16 14:44:07 -07:00
Brian Behlendorf
67c6255292
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2010-06-16 14:44:05 -07:00
Brian Behlendorf
fc3b5bf493
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
2010-06-16 14:44:00 -07:00
Brian Behlendorf
3f67a34204
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2010-06-16 14:43:58 -07:00
Brian Behlendorf
b5a9282fd8
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
2010-06-16 14:43:52 -07:00
Brian Behlendorf
68f12c3c0d
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2010-06-16 14:43:50 -07:00
Brian Behlendorf
fff91ade60
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
2010-06-16 14:43:45 -07:00
Brian Behlendorf
76ad38b271
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2010-06-16 14:43:43 -07:00
Brian Behlendorf
4c3864ba2b
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2010-06-16 14:43:37 -07:00
Brian Behlendorf
4aba89bb16
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2010-06-16 14:43:35 -07:00
Brian Behlendorf
0c051a50fe
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
2010-06-16 14:43:29 -07:00
Brian Behlendorf
4af4558675
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2010-06-16 14:43:26 -07:00
Brian Behlendorf
8645a8e901
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2010-06-16 14:43:21 -07:00
Brian Behlendorf
ca3849d1ce
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
2010-06-16 14:43:18 -07:00
Brian Behlendorf
2f457b7bd0
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2010-06-16 14:43:17 -07:00