Brian Behlendorf
|
8578673221
|
Add DTRACE_PROBE(a) macro
|
2008-12-19 10:01:38 -08:00 |
|
Brian Behlendorf
|
fa6f423f31
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2008-12-19 09:54:43 -08:00 |
|
Brian Behlendorf
|
24e15d1bb1
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-19 09:52:57 -08:00 |
|
Brian Behlendorf
|
2d0ae2710c
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-19 09:52:53 -08:00 |
|
Brian Behlendorf
|
5906903384
|
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
|
2008-12-19 09:52:52 -08:00 |
|
Brian Behlendorf
|
3d8832a795
|
Merge branch 'fix-pthreads' into refs/top-bases/fix-branch
|
2008-12-19 09:52:51 -08:00 |
|
Brian Behlendorf
|
3bc48c3e74
|
Missing func readd
|
2008-12-19 09:50:15 -08:00 |
|
Brian Behlendorf
|
111303eeb8
|
context
|
2008-12-19 09:47:09 -08:00 |
|
Brian Behlendorf
|
dbc567603d
|
Readd removed hunk
|
2008-12-19 09:39:17 -08:00 |
|
Brian Behlendorf
|
56217b4c11
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-19 09:32:50 -08:00 |
|
Brian Behlendorf
|
cdcb2af79b
|
Add proper header
|
2008-12-19 09:30:56 -08:00 |
|
Brian Behlendorf
|
1e0f1b2c02
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-19 09:08:03 -08:00 |
|
Brian Behlendorf
|
a1e023d7a4
|
Add strtoxx functions
|
2008-12-19 09:05:50 -08:00 |
|
Brian Behlendorf
|
acfcb00a6e
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2008-12-18 13:20:04 -08:00 |
|
Brian Behlendorf
|
da1ceb2bbe
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-18 13:18:27 -08:00 |
|
Brian Behlendorf
|
72bf32a79f
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-18 13:18:19 -08:00 |
|
Brian Behlendorf
|
844a9ced6d
|
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
|
2008-12-18 13:18:17 -08:00 |
|
Brian Behlendorf
|
33e499be43
|
Merge branch 'fix-stack' into refs/top-bases/fix-branch
|
2008-12-18 13:18:15 -08:00 |
|
Brian Behlendorf
|
8e136cf0c9
|
Add noinline macro for userspace
|
2008-12-18 13:15:58 -08:00 |
|
Brian Behlendorf
|
16dc43525b
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2008-12-18 10:03:15 -08:00 |
|
Brian Behlendorf
|
4d86e8fa92
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-18 10:01:44 -08:00 |
|
Brian Behlendorf
|
0a353443cd
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-18 10:01:41 -08:00 |
|
Brian Behlendorf
|
9c0846462b
|
Resolve conflict
|
2008-12-18 10:01:37 -08:00 |
|
Brian Behlendorf
|
4df7b421a1
|
Merge branch 'fix-pthreads' into refs/top-bases/fix-branch
|
2008-12-18 10:00:46 -08:00 |
|
Brian Behlendorf
|
25a3fca866
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2008-12-18 10:00:45 -08:00 |
|
Brian Behlendorf
|
9e195d0cbf
|
Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch
|
2008-12-18 10:00:44 -08:00 |
|
Brian Behlendorf
|
c8f253cda8
|
Now fixed in fix-pthreads branch
|
2008-12-18 09:58:42 -08:00 |
|
Brian Behlendorf
|
229aba2943
|
Properly cast thread functions for pthreads
|
2008-12-18 09:56:22 -08:00 |
|
Brian Behlendorf
|
893ed2fad0
|
Properly cast thread functions for pthreads
|
2008-12-18 09:56:05 -08:00 |
|
Brian Behlendorf
|
d511dad31e
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-18 09:40:07 -08:00 |
|
Brian Behlendorf
|
5915f86ab1
|
Add callb.h header
|
2008-12-18 09:38:10 -08:00 |
|
Brian Behlendorf
|
fe5b927a4a
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2008-12-18 09:36:22 -08:00 |
|
Brian Behlendorf
|
0a6ac25d10
|
Add vmem_ interface mapping for user space
|
2008-12-18 09:34:27 -08:00 |
|
Brian Behlendorf
|
c90836a39f
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2008-12-17 16:47:17 -08:00 |
|
Brian Behlendorf
|
c27a2516c2
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-17 16:43:55 -08:00 |
|
Brian Behlendorf
|
f799177730
|
Add all sources for libzfs userspace funcationality
|
2008-12-17 16:39:45 -08:00 |
|
Brian Behlendorf
|
8b33b8f8cd
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-17 16:08:05 -08:00 |
|
Brian Behlendorf
|
0f7520c7b0
|
Add gethrtime
|
2008-12-17 16:04:10 -08:00 |
|
Brian Behlendorf
|
b07886e188
|
Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch
|
2008-12-17 16:00:29 -08:00 |
|
Brian Behlendorf
|
9ab4c93028
|
Wrap more stuff in HAVE_ZPL
|
2008-12-17 15:58:20 -08:00 |
|
Brian Behlendorf
|
9877a35f9f
|
Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch
|
2008-12-17 15:35:41 -08:00 |
|
Brian Behlendorf
|
06005641bb
|
Stub out mount/share related func
|
2008-12-17 15:33:45 -08:00 |
|
Brian Behlendorf
|
99a4e4a121
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-17 14:36:43 -08:00 |
|
Brian Behlendorf
|
e3150dafb7
|
Add getexecname to Makefile.am
|
2008-12-17 14:34:48 -08:00 |
|
Brian Behlendorf
|
6a0d0cbd0f
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-17 14:16:20 -08:00 |
|
Brian Behlendorf
|
370f0a1773
|
Add zone and getmntany sources
|
2008-12-17 14:14:23 -08:00 |
|
Brian Behlendorf
|
c1e34481d8
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2008-12-17 13:38:38 -08:00 |
|
Brian Behlendorf
|
6a6463a6a6
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-17 13:38:05 -08:00 |
|
Brian Behlendorf
|
3be083292c
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-17 13:37:10 -08:00 |
|
Brian Behlendorf
|
ba3d5afa54
|
Add missing \
|
2008-12-17 13:35:06 -08:00 |
|
Brian Behlendorf
|
33b73cd800
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2008-12-17 11:37:48 -08:00 |
|
Brian Behlendorf
|
bda39e3f52
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-17 11:37:16 -08:00 |
|
Brian Behlendorf
|
e0f0e02636
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-17 11:36:22 -08:00 |
|
Brian Behlendorf
|
5ea99efac7
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-17 11:36:20 -08:00 |
|
Brian Behlendorf
|
676ab35598
|
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
|
2008-12-17 11:36:19 -08:00 |
|
Brian Behlendorf
|
0106dabb11
|
Merge branch 'fix-pthreads' into refs/top-bases/fix-branch
|
2008-12-17 11:36:18 -08:00 |
|
Brian Behlendorf
|
a681d70e28
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2008-12-17 11:36:17 -08:00 |
|
Brian Behlendorf
|
e532f6bef4
|
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
|
2008-12-17 11:36:16 -08:00 |
|
Brian Behlendorf
|
8af904a4b0
|
Resolve index shadowing /usr/include/string.h:304
|
2008-12-17 11:34:19 -08:00 |
|
Brian Behlendorf
|
ed9a35324d
|
Not sure why Sun needed to remove these externs, but I need them back
|
2008-12-17 11:32:47 -08:00 |
|
Brian Behlendorf
|
d8a55bcb89
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2008-12-17 11:28:46 -08:00 |
|
Brian Behlendorf
|
199eaf1874
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-17 11:28:16 -08:00 |
|
Brian Behlendorf
|
01e5ef8ebe
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-17 11:27:23 -08:00 |
|
Brian Behlendorf
|
25db7e9413
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-17 11:27:21 -08:00 |
|
Brian Behlendorf
|
935fd6c681
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2008-12-17 11:27:20 -08:00 |
|
Brian Behlendorf
|
55c8582174
|
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
|
2008-12-17 11:27:19 -08:00 |
|
Brian Behlendorf
|
dcf0fb9ffb
|
Resolve shadow conflicts
|
2008-12-17 11:25:21 -08:00 |
|
Brian Behlendorf
|
e5191c5ed5
|
Resolve conflict
|
2008-12-17 11:19:19 -08:00 |
|
Brian Behlendorf
|
35257bfbd6
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-17 11:18:11 -08:00 |
|
Brian Behlendorf
|
746c17afcf
|
Resolve conflict
|
2008-12-17 11:16:41 -08:00 |
|
Brian Behlendorf
|
7973e77bfc
|
Re-add zpool (part of it), we need to build it for the common bits
|
2008-12-17 11:12:06 -08:00 |
|
Brian Behlendorf
|
1ef609d29e
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-17 10:45:00 -08:00 |
|
Brian Behlendorf
|
4291b2e02f
|
Add locale.h
|
2008-12-17 10:43:06 -08:00 |
|
Brian Behlendorf
|
5ce03568c6
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-17 10:12:32 -08:00 |
|
Brian Behlendorf
|
e23605530a
|
Update #ifndef/#defines
|
2008-12-17 10:10:32 -08:00 |
|
Brian Behlendorf
|
6d524f2906
|
Cleanup some of the #ifndef/#defines
|
2008-12-17 10:06:55 -08:00 |
|
Brian Behlendorf
|
07394c4b64
|
Add mkdev.h rename _SOL_SYS to _LIBSPL_SYS
|
2008-12-17 10:04:04 -08:00 |
|
Brian Behlendorf
|
204ec2e8f4
|
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
|
2008-12-17 09:50:56 -08:00 |
|
Brian Behlendorf
|
0b7ef284bd
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-17 09:50:55 -08:00 |
|
Brian Behlendorf
|
bcbf74fead
|
Remove assert/verify support from zfs_context, moved to assert.h
|
2008-12-17 09:49:02 -08:00 |
|
Brian Behlendorf
|
5945ae3161
|
Move verify/assert userspace functionality to libspl to simply everything, this way it only lives in one place where you need to build with libzfs.h or zfs_context.h
|
2008-12-17 09:43:11 -08:00 |
|
Brian Behlendorf
|
5c9d50894c
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2008-12-16 16:39:02 -08:00 |
|
Brian Behlendorf
|
8ad2f7697a
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2008-12-16 16:38:48 -08:00 |
|
Brian Behlendorf
|
daa6dfed96
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-16 16:37:05 -08:00 |
|
Brian Behlendorf
|
715ac6ca88
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-16 16:34:16 -08:00 |
|
Brian Behlendorf
|
7453ec0f2c
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-16 16:34:09 -08:00 |
|
Brian Behlendorf
|
8bed8da925
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2008-12-16 16:34:07 -08:00 |
|
Brian Behlendorf
|
2d7f255945
|
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
|
2008-12-16 16:34:04 -08:00 |
|
Brian Behlendorf
|
ebab24f633
|
Resolve shadow conflict
|
2008-12-16 16:26:50 -08:00 |
|
Brian Behlendorf
|
2d271e7a94
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2008-12-16 16:22:42 -08:00 |
|
Brian Behlendorf
|
3d34904fbb
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2008-12-16 16:22:34 -08:00 |
|
Brian Behlendorf
|
015fcbe3b2
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-16 16:21:32 -08:00 |
|
Brian Behlendorf
|
6a902fe21c
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-16 16:19:56 -08:00 |
|
Brian Behlendorf
|
f2bc2f7b6f
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-16 16:19:52 -08:00 |
|
Brian Behlendorf
|
fd4da48000
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2008-12-16 16:19:50 -08:00 |
|
Brian Behlendorf
|
29be0d44ba
|
Resolve conflict
|
2008-12-16 16:19:46 -08:00 |
|
Brian Behlendorf
|
4d21a1c977
|
Resolve two more shadow conflicts
|
2008-12-16 16:14:19 -08:00 |
|
Brian Behlendorf
|
4ee4891d66
|
Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch
|
2008-12-16 16:10:16 -08:00 |
|
Brian Behlendorf
|
862436f8c9
|
Strip out userspace interface to mount the FS. I need to talk about the right way to manage these changes with the lustre group at Sun, and see where they stand
|
2008-12-16 16:06:24 -08:00 |
|
Brian Behlendorf
|
f50ed8e8c6
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2008-12-16 15:52:50 -08:00 |