Commit Graph

2470 Commits

Author SHA1 Message Date
Brian Behlendorf b8ece25717 Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch 2010-06-16 12:11:25 -07:00
Brian Behlendorf 9fd12ce4fd Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2010-06-16 12:11:21 -07:00
Brian Behlendorf 2b71569742 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2010-06-16 12:11:20 -07:00
Brian Behlendorf 877a37d8bd Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch 2010-06-16 12:11:18 -07:00
Brian Behlendorf 8a001d8f59 Extra uninit vars flagged by gcc 4.1.2
Newer versions of the compiler are OK with this but for the sake of
older compilers explicitly initialize them.
2010-06-16 11:45:07 -07:00
Brian Behlendorf 916ff9bb97 Merge branch 'linux-events' into refs/top-bases/linux-zfs-branch 2010-06-16 10:38:58 -07:00
Brian Behlendorf 79577be589 Ensure sys/fm/util.h ia not included
Because of events related changes and the need to access zio_cmd_t
we can't unconditionally include sys/fm/util.h as part of zfs_context.h.
2010-06-16 10:34:40 -07:00
Brian Behlendorf 3fe3e41259 Merge branch 'linux-spa-thread' into refs/top-bases/linux-zfs-branch 2010-06-16 10:01:06 -07:00
Brian Behlendorf 6104e13be6 Add linux-spa-thread topic branch
Disable the spa thread under Linux until it can be implemented.
2010-06-16 09:59:39 -07:00
Brian Behlendorf 6fa858c778 Merge branch 'linux-sha2' into refs/top-bases/linux-zfs-branch 2010-06-16 09:49:06 -07:00
Brian Behlendorf 14d073e298 Add linux-sha2 topic branch for portability
The upstream ZFS code has correctly moved to a faster native sha2
implementation.  Unfortunately, under Linux that's going to be a little
problematic so we revert the code to the more portable version contained
in earlier ZFS releases.  Using the native sha2 implementation in Linux
is possible but the API is slightly different in kernel version user
space depending on which libraries are used.  Ideally, we need a fast
implementation of SHA256 which builds as part of ZFS this shouldn't be
that hard to do but it will take some effort.
2010-06-16 09:47:25 -07:00
Brian Behlendorf 55b02e4ca6 Merge commit 'refs/top-bases/linux-events' into linux-events 2010-06-14 17:00:29 -07:00
Brian Behlendorf 0f3a1ce26e Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
Conflicts:

	module/zfs/include/sys/dmu.h
2010-06-14 16:57:03 -07:00
Brian Behlendorf b41c7ff877 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2010-06-14 16:45:47 -07:00
Brian Behlendorf 7f181ac166 Merge branch 'fix-branch' into refs/top-bases/zfs-branch 2010-06-14 16:45:46 -07:00
Brian Behlendorf 2f30cc0188 Merge branch 'fix-stack-lzjb' into refs/top-bases/fix-branch 2010-06-14 16:45:33 -07:00
Brian Behlendorf b8cc785fb6 Add fix-stack-lzjb topic branch
Reduce kernel stack usage by lzjb_compress() by moving uint16 array
off the stack and on to the heap.  The exact performance implications
of this I have not measured but we absolutely need to keep stack
usage to a minimum.  If/when this becomes and issue we optimize.
2010-06-14 16:45:01 -07:00
Brian Behlendorf 51322821f3 Merge branch 'fix-kstat-xuio' into refs/top-bases/fix-branch 2010-06-14 16:43:32 -07:00
Brian Behlendorf f61a7ce9e1 Add fix-kstat-xuio topic branch
Move xiou stat structures from a header to the dmu.c source as is
done with all the other kstat interfaces.  This information is local
to dmu.c registered the xuio kstat and should stay that way.
2010-06-14 16:43:01 -07:00
Brian Behlendorf 963518b20f Merge branch 'fix-metaslab' into refs/top-bases/fix-branch 2010-06-14 16:40:45 -07:00
Brian Behlendorf f3a61f709d Add fix-metaslab topic branch
If your only going to allow one allocator to be used and it is defined
at compile time there is no point including the others in the build.
This patch could/should be refined for Linux to make the metaslab
configurable at run time.  That might be a bit tricky however since
you would need to quiese all IO.  Short of that making it configurable
as a module load option would be a reasonable compromise.
2010-06-14 16:40:26 -07:00
Brian Behlendorf f3f44cbd31 Merge branch 'fix-current' into refs/top-bases/fix-branch 2010-06-14 16:39:27 -07:00
Brian Behlendorf 6cf7f7c9df Add fix-current topic branch
In the linux kernel 'current' is defined to mean the current process
and can never be used as a local variable in a function.  Simply
replace all usage of 'current' with 'curr' in this function.
2010-06-14 16:38:56 -07:00
Brian Behlendorf 832eb9444f Merge commit 'refs/top-bases/linux-events' into linux-events 2010-06-14 16:29:25 -07:00
Brian Behlendorf 1aeae83705 Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch 2010-06-14 16:27:50 -07:00
Brian Behlendorf 08060ef853 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2010-06-14 16:25:02 -07:00
Brian Behlendorf eb894076a4 Merge branch 'fix-branch' into refs/top-bases/zfs-branch
Conflicts:

	cmd/ztest/ztest.c
2010-06-14 16:24:45 -07:00
Brian Behlendorf bce1904fbb Merge branch 'fix-taskq' into refs/top-bases/fix-branch 2010-06-14 16:21:59 -07:00
Brian Behlendorf 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
Brian Behlendorf 3731ec7cf5 Merge branch 'linux-debug-zerocopy' into refs/top-bases/linux-zfs-branch 2010-06-14 16:11:05 -07:00
Brian Behlendorf 9974b54060 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2010-06-14 16:11:02 -07:00
Brian Behlendorf 6348afcb98 Merge branch 'linux-events' into refs/top-bases/linux-zfs-branch 2010-06-14 16:10:57 -07:00
Brian Behlendorf f2229fe24d Merge branch 'linux-kernel-device' into refs/top-bases/linux-zfs-branch 2010-06-14 16:10:55 -07:00
Brian Behlendorf 9193fdea7e Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch 2010-06-14 16:10:54 -07:00
Brian Behlendorf 6eac28ff79 Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch 2010-06-14 16:10:53 -07:00
Brian Behlendorf 96095c3a17 Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 2010-06-14 16:10:51 -07:00
Brian Behlendorf 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
Brian Behlendorf 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
Brian Behlendorf 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
Brian Behlendorf 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
Brian Behlendorf 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
Brian Behlendorf 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
Brian Behlendorf 760c0c3629 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2010-06-14 15:53:44 -07:00
Brian Behlendorf 24d1a8e0ed Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2010-06-14 15:53:43 -07:00
Brian Behlendorf f9e717f642 Merge commit 'refs/top-bases/linux-events' into linux-events 2010-06-14 15:53:31 -07:00
Brian Behlendorf 101243ff1d Merge commit 'refs/top-bases/linux-kernel-device' into linux-kernel-device 2010-06-14 15:53:24 -07:00
Brian Behlendorf 84f16a207f Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch 2010-06-14 15:52:45 -07:00
Brian Behlendorf 3877ce40fa Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2010-06-14 15:52:43 -07:00
Brian Behlendorf edb4ee024f Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2010-06-14 15:52:19 -07:00
Brian Behlendorf 2a00f10bf8 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2010-06-14 15:52:11 -07:00