49ad53c46f
Update fix-taskq to never sleep at interrupt time
...
Updated fix to detect if we are in an interrupt and only sleep if it
is safe to do some. I guess it must be safe to sleep under Solaris
this must be handled in a sort interrupt handler there
2010-06-14 16:14:23 -07:00
3731ec7cf5
Merge branch 'linux-debug-zerocopy' into refs/top-bases/linux-zfs-branch
2010-06-14 16:11:05 -07:00
9974b54060
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2010-06-14 16:11:02 -07:00
6348afcb98
Merge branch 'linux-events' into refs/top-bases/linux-zfs-branch
2010-06-14 16:10:57 -07:00
f2229fe24d
Merge branch 'linux-kernel-device' into refs/top-bases/linux-zfs-branch
2010-06-14 16:10:55 -07:00
9193fdea7e
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
2010-06-14 16:10:54 -07:00
6eac28ff79
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
2010-06-14 16:10:53 -07:00
96095c3a17
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2010-06-14 16:10:51 -07:00
e7e0311ce4
Update linux-kernel-mem
...
Additional minor memory related tweak to move certain large allocations
to virtual memory and in one case to simply suppress the warning message
since it is not that far over the warning limit.
2010-06-14 16:08:15 -07:00
67e8f48f1b
Update linux-kernel-device to handle ioc changes
...
Upstream they modified the ioctl code so we need to make similiar
updates since we modify the API ourselves to always pass a pointer
to file pointer around. This allows us to track per file handle
state which is used by the zevent code.
2010-06-14 16:04:00 -07:00
302238d84f
Update linux-user-disk
...
Minor updates to handle changes in the user side of ZFS, utils and such.
2010-06-14 16:03:02 -07:00
800b7a03e1
Update linux-kernel-disk ZVOL implementation
...
The ZVOL interfaces changed significantly with the latest update. I've
updated the Linux version of the code to handle this and it looks like
the net result has been a simpler implementation which is good! Plus,
I'm relatively sure the ZIL integration is right this time although it
needs some serious crash testing to verify that.
Also minor additions to vdev_disk for .hold and .rele callbacks.
Currently, they do nothing and I may be able to simply stub them out
with NULLs for Linux since opening the device in Linux should have
much the same effort. More investigation is needed though since
the ZFS interface may make some demands here I'm overlooking.
2010-06-14 16:02:03 -07:00
1b55fad32f
Updates to linux-user-disk
...
The major change is removing the thread pool when importing devices.
This may be reintroduced at some point if needed, but it is added
complexity which has already been handled by blkid on modern Linux
systems. We only need to fallback to probing everything is /dev/
if you config file is toast and even then it only takes a few seconds.
2010-06-14 15:59:11 -07:00
e92d6d861f
Update linux-kernel-module with refreshed EXPORT_SYMBOLs
...
After such a large update many of the symbols which were previously
exported are no longer available, and several new symbols have been
added and are needed. Refresh to topic branch to reflect this.
2010-06-14 15:58:15 -07:00
3a0400ad88
Update linux-events
...
Minor updates to linux-events to handle some upstream changes. Luckily,
this was done flexibly enough the first time it wasn't much of a problem.
2010-06-14 15:57:09 -07:00
eecd2e6012
Merge branch 'linux-user-util' into refs/top-bases/linux-zfs-branch
2010-06-14 15:53:55 -07:00
be3355a045
Merge commit 'refs/top-bases/linux-user-util' into linux-user-util
2010-06-14 15:53:52 -07:00
b5edc0d0bd
Merge branch 'linux-debug-zerocopy' into refs/top-bases/linux-zfs-branch
2010-06-14 15:53:47 -07:00
760c0c3629
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2010-06-14 15:53:44 -07:00
24d1a8e0ed
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2010-06-14 15:53:43 -07:00
c6abbbee44
Merge branch 'linux-events' into refs/top-bases/linux-zfs-branch
2010-06-14 15:53:34 -07:00
f9e717f642
Merge commit 'refs/top-bases/linux-events' into linux-events
2010-06-14 15:53:31 -07:00
047d6780fd
Merge branch 'linux-kernel-device' into refs/top-bases/linux-zfs-branch
2010-06-14 15:53:26 -07:00
101243ff1d
Merge commit 'refs/top-bases/linux-kernel-device' into linux-kernel-device
2010-06-14 15:53:24 -07:00
5594aecf8d
Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch
2010-06-14 15:53:18 -07:00
4338cfa72e
Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap
2010-06-14 15:53:15 -07:00
a25436916c
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
2010-06-14 15:53:09 -07:00
fb6b47d82e
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2010-06-14 15:53:07 -07:00
ee3f408b82
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
2010-06-14 15:53:01 -07:00
a1998ff42f
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2010-06-14 15:52:58 -07:00
0eff59a95e
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2010-06-14 15:52:53 -07:00
b60b922211
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2010-06-14 15:52:51 -07:00
84f16a207f
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2010-06-14 15:52:45 -07:00
3877ce40fa
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2010-06-14 15:52:43 -07:00
f8108816e5
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
2010-06-14 15:52:37 -07:00
0c0ea412b3
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2010-06-14 15:52:34 -07:00
cc2418a4b5
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
2010-06-14 15:52:29 -07:00
990247fc4d
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2010-06-14 15:52:26 -07:00
4f7611239f
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
2010-06-14 15:52:21 -07:00
edb4ee024f
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2010-06-14 15:52:19 -07:00
0a23bba171
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2010-06-14 15:52:13 -07:00
2a00f10bf8
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2010-06-14 15:52:11 -07:00
ecd06f07cd
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
2010-06-14 15:52:05 -07:00
66f323c624
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2010-06-14 15:52:02 -07:00
fb35fe3bc1
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2010-06-14 15:51:56 -07:00
e5175423ea
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
2010-06-14 15:51:54 -07:00
06b5dc883f
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2010-06-14 15:51:52 -07:00
953aa00176
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2010-06-14 15:51:51 -07:00
3700f9d20b
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
2010-06-14 15:51:50 -07:00
5fa2cb516b
Merge branch 'gcc-missing-braces' into refs/top-bases/gcc-branch
2010-06-14 15:51:50 -07:00
Brian Behlendorf