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
21690470e3
Update linux-zpios to use updated DMU API
...
The DMU API has been modified to remove the dmu_objset_open, and
dmu_objset_close functions. Now you must explicitly *_create an
objset, then *_own it, *_disown it when not in use, and *_destroy
it when your through. All and all I like the API much better.
Additionally, while I was here I moved the zpios_cmd_t off the
stack because previous analysis showed it was very stack heavy.
2010-06-14 15:48:55 -07:00
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
c430e23552
Update zfs-branch with build system updates
...
Required Makefile modifications for updated ZFS code.
2010-06-14 15:46:11 -07:00
ea78161e40
Update META to version 0.5.0
2010-06-14 15:45:23 -07:00
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
c9980d55c5
Merge branch 'linux-user-util' into refs/top-bases/linux-zfs-branch
2010-06-14 15:39:16 -07:00
d807a65ad4
Merge commit 'refs/top-bases/linux-user-util' into linux-user-util
2010-06-14 15:39:13 -07:00
8f13ff8114
Merge branch 'linux-debug-zerocopy' into refs/top-bases/linux-zfs-branch
2010-06-14 15:39:07 -07:00
9953f52bec
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2010-06-14 15:39:05 -07:00
12fac2aa2c
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2010-06-14 15:39:03 -07:00
bb669cdfcf
Merge branch 'linux-events' into refs/top-bases/linux-zfs-branch
2010-06-14 15:38:53 -07:00
c52a71873a
Merge commit 'refs/top-bases/linux-events' into linux-events
2010-06-14 15:38:51 -07:00
1c58de0efe
Merge branch 'linux-kernel-device' into refs/top-bases/linux-zfs-branch
2010-06-14 15:38:45 -07:00
ac23e26b6c
Merge commit 'refs/top-bases/linux-kernel-device' into linux-kernel-device
2010-06-14 15:38:42 -07:00
ef49a950f5
Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch
2010-06-14 15:38:36 -07:00
72812fbc40
Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap
2010-06-14 15:38:34 -07:00
a017b8024c
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
2010-06-14 15:38:28 -07:00
0e2926b142
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2010-06-14 15:38:26 -07:00
e602ca25eb
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
2010-06-14 15:38:20 -07:00
Brian Behlendorf