Commit Graph

19732 Commits

Author SHA1 Message Date
Brian Behlendorf 91cc4e35bb Updates to linux-libspl
Added print_timestamp() compatibility function, this will be needed
long term but it's a simply enough addition.

Added Solaris style label functions.  This was done simply to aid in
the initial update to onnv_141.  I'm hopeful that after more careful
inspection all of this can be removed and we can integrate with a
more Linux friendly Solution without breaking any compatibility.

Added several missing headers which are required by the updated
version of ZFS.  As usual I just add empty headers if needed because
it's easier than tracking the change against the core ZFS code.

Added SEC, MILLISEC, MICROSEC defines if unavailable.

Added missing xuio structure and typedefs.  I'm hopeful these can
be removed as well once we crack the zero-copy nut under Linux.
2010-06-14 15:47:54 -07:00
Brian Behlendorf c430e23552 Update zfs-branch with build system updates
Required Makefile modifications for updated ZFS code.
2010-06-14 15:46:11 -07:00
Brian Behlendorf ea78161e40 Update META to version 0.5.0 2010-06-14 15:45:23 -07:00
Brian Behlendorf 696ec7fb61 Update gcc-missing-braces based on structure changes
Almost exclusively this patch handled the addition of another char
array to the zfs_cmd_t structure.  Unfortunately c90 doesn't allow
zero filling the entire struct with the '= { 0 };' shorthand.
2010-06-14 15:44:06 -07:00
Brian Behlendorf c9980d55c5 Merge branch 'linux-user-util' into refs/top-bases/linux-zfs-branch 2010-06-14 15:39:16 -07:00
Brian Behlendorf d807a65ad4 Merge commit 'refs/top-bases/linux-user-util' into linux-user-util 2010-06-14 15:39:13 -07:00
Brian Behlendorf 8f13ff8114 Merge branch 'linux-debug-zerocopy' into refs/top-bases/linux-zfs-branch 2010-06-14 15:39:07 -07:00
Brian Behlendorf 9953f52bec Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2010-06-14 15:39:05 -07:00
Brian Behlendorf 12fac2aa2c Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2010-06-14 15:39:03 -07:00
Brian Behlendorf bb669cdfcf Merge branch 'linux-events' into refs/top-bases/linux-zfs-branch 2010-06-14 15:38:53 -07:00
Brian Behlendorf c52a71873a Merge commit 'refs/top-bases/linux-events' into linux-events 2010-06-14 15:38:51 -07:00
Brian Behlendorf 1c58de0efe Merge branch 'linux-kernel-device' into refs/top-bases/linux-zfs-branch 2010-06-14 15:38:45 -07:00
Brian Behlendorf ac23e26b6c Merge commit 'refs/top-bases/linux-kernel-device' into linux-kernel-device 2010-06-14 15:38:42 -07:00
Brian Behlendorf ef49a950f5 Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch 2010-06-14 15:38:36 -07:00
Brian Behlendorf 72812fbc40 Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap 2010-06-14 15:38:34 -07:00
Brian Behlendorf a017b8024c Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch 2010-06-14 15:38:28 -07:00
Brian Behlendorf 0e2926b142 Merge commit 'refs/top-bases/linux-ztest' into linux-ztest 2010-06-14 15:38:26 -07:00
Brian Behlendorf e602ca25eb Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch 2010-06-14 15:38:20 -07:00
Brian Behlendorf b898aa277b Merge commit 'refs/top-bases/linux-unused' into linux-unused 2010-06-14 15:38:18 -07:00
Brian Behlendorf 7cf4e3d968 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2010-06-14 15:38:12 -07:00
Brian Behlendorf a43ad49f64 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2010-06-14 15:38:09 -07:00
Brian Behlendorf 9c5619495e Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch 2010-06-14 15:38:03 -07:00
Brian Behlendorf 541bbe3109 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2010-06-14 15:38:01 -07:00
Brian Behlendorf e75900a103 Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch 2010-06-14 15:37:55 -07:00
Brian Behlendorf d860bca64c Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2010-06-14 15:37:52 -07:00
Brian Behlendorf 5b56c5f795 Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch 2010-06-14 15:37:46 -07:00
Brian Behlendorf e35dc10161 Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2010-06-14 15:37:44 -07:00
Brian Behlendorf d6eefb7ef1 Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch 2010-06-14 15:37:38 -07:00
Brian Behlendorf ec5ef84e8a Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2010-06-14 15:37:35 -07:00
Brian Behlendorf 115609a5ce Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 2010-06-14 15:37:29 -07:00
Brian Behlendorf 11aa5acb59 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2010-06-14 15:37:26 -07:00
Brian Behlendorf 7dd687cb06 Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch 2010-06-14 15:37:20 -07:00
Brian Behlendorf f1d30e721b Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2010-06-14 15:37:17 -07:00
Brian Behlendorf e796e2a03e Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch 2010-06-14 15:37:10 -07:00
Brian Behlendorf efdca3b5bc Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2010-06-14 15:37:07 -07:00
Brian Behlendorf 7eadc495c6 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2010-06-14 15:37:05 -07:00
Brian Behlendorf b5ba75f385 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2010-06-14 15:37:03 -07:00
Brian Behlendorf 7022cf22c3 Merge commit 'refs/top-bases/gcc-branch' into gcc-branch 2010-06-14 15:37:02 -07:00
Brian Behlendorf dfe881c0ef Merge branch 'gcc-unused' into refs/top-bases/gcc-branch 2010-06-14 15:37:01 -07:00
Brian Behlendorf 1e7a75049a Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch 2010-06-14 15:37:00 -07:00
Brian Behlendorf c8d75a1c9d Merge branch 'gcc-no-parenthesis' into refs/top-bases/gcc-branch 2010-06-14 15:37:00 -07:00
Brian Behlendorf d9f910d423 Merge branch 'gcc-missing-case' into refs/top-bases/gcc-branch 2010-06-14 15:36:59 -07:00
Brian Behlendorf 993fa8c15c Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch 2010-06-14 15:36:59 -07:00
Brian Behlendorf 2c95012288 Merge branch 'gcc-c90' into refs/top-bases/gcc-branch 2010-06-14 15:36:59 -07:00
Brian Behlendorf 3135b5a26a Update gcc-c90 minor updates
Originally these changes were on other gcc-* topic branches but
because c90 touches the same bit of code and I'd like to keep all
the gcc-* branches completely parallel I've moved these few bits
over here.  This is one of the downsides of not just having one
big patch stack.
2010-06-14 15:32:54 -07:00
Brian Behlendorf d8e123dc27 Update gcc-unused
Fix new instances or changes in gcc flagged unused code.  These are
mostly related to variables which are not used when debugging is
disabled and the ASSERTs are compiled out.
2010-06-14 15:29:48 -07:00
Brian Behlendorf b41463f5e8 Update gcc-invalid-prototypes
Fix new invalid prototypes, typically just a missing void arg.
2010-06-14 15:25:49 -07:00
Brian Behlendorf b320a7bb4b Update gcc-unit
Fix new possibly uninitialized variables according to gcc.
2010-06-14 15:24:20 -07:00
Brian Behlendorf 0a8593375e Update gcc-missing-case
Fix new locations of an incomplete case statement.
2010-06-14 15:19:09 -07:00
Brian Behlendorf 1893aa76ec Update gcc-no-parenthesis
Fix new locations of missing parenthesis according to gcc.
2010-06-14 15:16:41 -07:00