Commit Graph

19732 Commits

Author SHA1 Message Date
Brian Behlendorf 2b71569742 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2010-06-16 12:11:20 -07:00
Brian Behlendorf f00293115a Merge commit 'refs/top-bases/gcc-branch' into gcc-branch 2010-06-16 12:11:19 -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 2cda60c980 Merge branch 'linux-topology' into refs/top-bases/linux-zfs-branch 2010-06-16 09:57:10 -07:00
Brian Behlendorf 8c7748d8e0 Add linux-topology topic branch
Solaris recently introduced the idea of drive topology because
where a drive is located does matter.  I have already handled
this with udev/blkid integration under Linux so I'm hopeful
this case can simply be removed but for now I've just stubbed
out what is needed in libspl and commented out the rest here.
2010-06-16 09:55:34 -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 1b1f5d19e4 Merge branch 'linux-user-util' into refs/top-bases/linux-zfs-branch 2010-06-14 17:00:53 -07:00
Brian Behlendorf 70bc736b0c Merge commit 'refs/top-bases/linux-user-util' into linux-user-util 2010-06-14 17:00:51 -07:00
Brian Behlendorf c1fb84eeb2 Merge branch 'linux-debug-zerocopy' into refs/top-bases/linux-zfs-branch 2010-06-14 17:00:45 -07:00
Brian Behlendorf e8e324e048 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2010-06-14 17:00:43 -07:00
Brian Behlendorf 5de3a200c4 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2010-06-14 17:00:42 -07:00
Brian Behlendorf d2412c0804 Merge branch 'linux-events' into refs/top-bases/linux-zfs-branch 2010-06-14 17:00:32 -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 592e92e484 Merge branch 'linux-kernel-device' into refs/top-bases/linux-zfs-branch 2010-06-14 17:00:24 -07:00
Brian Behlendorf bfdcbd7014 Merge commit 'refs/top-bases/linux-kernel-device' into linux-kernel-device 2010-06-14 17:00:21 -07:00
Brian Behlendorf 1b98bb37c0 Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch 2010-06-14 17:00:15 -07:00
Brian Behlendorf fefcb4a302 Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap 2010-06-14 17:00:13 -07:00
Brian Behlendorf 1f7732a6c7 Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch 2010-06-14 17:00:07 -07:00
Brian Behlendorf ed61cbe426 Merge commit 'refs/top-bases/linux-ztest' into linux-ztest 2010-06-14 17:00:05 -07:00
Brian Behlendorf b529f7432a Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch 2010-06-14 16:59:59 -07:00
Brian Behlendorf e7f1fdcdc6 Merge commit 'refs/top-bases/linux-unused' into linux-unused 2010-06-14 16:59:56 -07:00
Brian Behlendorf e219a5c07c Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2010-06-14 16:59:51 -07:00
Brian Behlendorf b7d6d07e72 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2010-06-14 16:59:48 -07:00
Brian Behlendorf f9dd8b600e Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch 2010-06-14 16:59:42 -07:00
Brian Behlendorf f224397b56 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2010-06-14 16:59:40 -07:00
Brian Behlendorf f6ceaf8e1a Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch 2010-06-14 16:59:34 -07:00
Brian Behlendorf e7c6ce221e Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2010-06-14 16:59:31 -07:00
Brian Behlendorf f7bb55e975 Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch 2010-06-14 16:59:25 -07:00
Brian Behlendorf 540c492442 Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2010-06-14 16:59:23 -07:00
Brian Behlendorf 56e86f13bb Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch 2010-06-14 16:59:17 -07:00
Brian Behlendorf 09abb3e8ae Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2010-06-14 16:59:15 -07:00
Brian Behlendorf 122fc38430 Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 2010-06-14 16:59:09 -07:00
Brian Behlendorf 2d15a98cb9 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
Conflicts:

	module/zfs/include/sys/dmu.h
2010-06-14 16:59:02 -07:00
Brian Behlendorf 01d932a9fe Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch 2010-06-14 16:58:09 -07:00
Brian Behlendorf 5edd772c8c Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2010-06-14 16:58:06 -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 976cf85f39 Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2010-06-14 16:49:36 -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 1121733c6a Merge commit 'refs/top-bases/fix-branch' into fix-branch 2010-06-14 16:45:33 -07:00
Brian Behlendorf 4327d5dce3 New TopGit dependency: fix-stack-lzjb 2010-06-14 16:45:31 -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 2392c05ea7 Merge commit 'refs/top-bases/fix-branch' into fix-branch 2010-06-14 16:43:33 -07:00