Commit Graph

19483 Commits

Author SHA1 Message Date
Brian Behlendorf 2392c05ea7 Merge commit 'refs/top-bases/fix-branch' into fix-branch 2010-06-14 16:43:33 -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 f70976285e New TopGit dependency: fix-kstat-xuio 2010-06-14 16:43:30 -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 105afa78b4 Merge commit 'refs/top-bases/fix-branch' into fix-branch 2010-06-14 16:40:45 -07:00
Brian Behlendorf 9519cc9a54 New TopGit dependency: fix-metaslab 2010-06-14 16:40:43 -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 5b9ebcb897 Merge commit 'refs/top-bases/fix-branch' into fix-branch 2010-06-14 16:39:27 -07:00
Brian Behlendorf 7a73e51832 New TopGit dependency: fix-current 2010-06-14 16:39:25 -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 001dd630ce Merge branch 'linux-user-util' into refs/top-bases/linux-zfs-branch 2010-06-14 16:29:49 -07:00
Brian Behlendorf 626f94c867 Merge commit 'refs/top-bases/linux-user-util' into linux-user-util 2010-06-14 16:29:47 -07:00
Brian Behlendorf fd5e9377ad Merge branch 'linux-debug-zerocopy' into refs/top-bases/linux-zfs-branch 2010-06-14 16:29:41 -07:00
Brian Behlendorf b2b1bb3915 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2010-06-14 16:29:38 -07:00
Brian Behlendorf 1cf89258c3 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2010-06-14 16:29:37 -07:00
Brian Behlendorf 5def2c1c36 Merge branch 'linux-events' into refs/top-bases/linux-zfs-branch 2010-06-14 16:29:27 -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 8f9bce2a14 Merge branch 'linux-kernel-device' into refs/top-bases/linux-zfs-branch 2010-06-14 16:29:19 -07:00
Brian Behlendorf 4dfa80d6c8 Merge commit 'refs/top-bases/linux-kernel-device' into linux-kernel-device 2010-06-14 16:29:16 -07:00
Brian Behlendorf 1f96d8f20b Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch 2010-06-14 16:29:11 -07:00
Brian Behlendorf 27d5747412 Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap 2010-06-14 16:29:08 -07:00
Brian Behlendorf 420eb67d39 Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch 2010-06-14 16:29:03 -07:00
Brian Behlendorf ec2aedc3f3 Merge commit 'refs/top-bases/linux-ztest' into linux-ztest 2010-06-14 16:29:00 -07:00
Brian Behlendorf 8bf96f63d4 Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch 2010-06-14 16:28:55 -07:00
Brian Behlendorf bde2f03079 Merge commit 'refs/top-bases/linux-unused' into linux-unused 2010-06-14 16:28:52 -07:00
Brian Behlendorf cfda680b85 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2010-06-14 16:28:47 -07:00
Brian Behlendorf 828bf9cae2 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2010-06-14 16:28:45 -07:00
Brian Behlendorf ef98a19d74 Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch 2010-06-14 16:28:39 -07:00
Brian Behlendorf a1a41b3235 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2010-06-14 16:28:36 -07:00
Brian Behlendorf d83fb1ed4b Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch 2010-06-14 16:28:31 -07:00
Brian Behlendorf 5331e9f1f8 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2010-06-14 16:28:28 -07:00
Brian Behlendorf d35acbdfaf Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch 2010-06-14 16:28:22 -07:00
Brian Behlendorf 429c5c668c Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2010-06-14 16:28:20 -07:00
Brian Behlendorf c0892113ba Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch 2010-06-14 16:28:15 -07:00
Brian Behlendorf 67e6c9469a Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2010-06-14 16:28:12 -07:00
Brian Behlendorf d34015019a Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 2010-06-14 16:28:06 -07:00
Brian Behlendorf ed3fb30284 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2010-06-14 16:28:04 -07:00
Brian Behlendorf 22de48c480 Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch 2010-06-14 16:27:58 -07:00
Brian Behlendorf 040a350328 Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2010-06-14 16:27:55 -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 f178dd0726 Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2010-06-14 16:27:47 -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 2969945552 Merge branch 'fix-pthreads' into refs/top-bases/fix-branch 2010-06-14 16:22:00 -07:00
Brian Behlendorf a02204a8b5 Merge commit 'refs/top-bases/fix-branch' into fix-branch 2010-06-14 16:22:00 -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 6574b7cad4 New TopGit dependency: fix-pthreads 2010-06-14 16:21:57 -07:00
Brian Behlendorf f9f342c5f2 Add fix-pthreads topic branch
This is a portability change which removes the dependence of the Solaris
thread library.  All locations where Solaris thread API was used before
have been replaced with equivilant Solaris kernel style thread calls.
In user space the kernel style threading API is implemented in term of
the portable pthreads library.  This includes all threads, mutexs,
condition variables, reader/writer locks, and taskqs.
2010-06-14 16:20:44 -07:00