Brian Behlendorf
|
598a2f5f4d
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2009-01-09 16:11:55 -08:00 |
|
Brian Behlendorf
|
2f2ae376e8
|
ifdef out some zvol specific ioctls
|
2009-01-09 16:08:18 -08:00 |
|
Brian Behlendorf
|
1cf2f6a63e
|
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
|
2009-01-09 15:57:21 -08:00 |
|
Brian Behlendorf
|
1475f7234b
|
Make the ZPL only bits conditional
|
2009-01-09 15:55:19 -08:00 |
|
Brian Behlendorf
|
2148f8256b
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2009-01-09 15:52:02 -08:00 |
|
Brian Behlendorf
|
ca3acc4f50
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-01-09 15:52:00 -08:00 |
|
Brian Behlendorf
|
1dc5e6d02e
|
Remove HAVE_SPL should be HAVE_ZPL
|
2009-01-09 15:50:00 -08:00 |
|
Brian Behlendorf
|
ca48ebe083
|
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
|
2009-01-09 15:36:18 -08:00 |
|
Brian Behlendorf
|
f2b69bd921
|
Fix 2 more instances on XDR encoding which is not yet supported, us native encode
|
2009-01-09 15:34:32 -08:00 |
|
Brian Behlendorf
|
8f4340d3e8
|
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
|
2009-01-09 15:11:58 -08:00 |
|
Brian Behlendorf
|
39184ef9b4
|
Only needed by ZPL
|
2009-01-09 15:08:36 -08:00 |
|
Brian Behlendorf
|
bed94035fd
|
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
|
2009-01-09 14:46:42 -08:00 |
|
Brian Behlendorf
|
a7e5f34acb
|
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
|
2009-01-09 14:46:41 -08:00 |
|
Brian Behlendorf
|
d584ad239d
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2009-01-09 14:46:01 -08:00 |
|
Brian Behlendorf
|
4022f85bac
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2009-01-09 14:45:56 -08:00 |
|
Brian Behlendorf
|
764c8c5940
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-01-09 14:45:45 -08:00 |
|
Brian Behlendorf
|
be3a17e437
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-01-09 14:45:45 -08:00 |
|
Brian Behlendorf
|
d315fcf28e
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2009-01-09 14:45:13 -08:00 |
|
Brian Behlendorf
|
acafe53c8e
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2009-01-09 14:45:12 -08:00 |
|
Brian Behlendorf
|
fba5a806a8
|
ifdef HAVE_ZPL out source files with only ZPL bits
|
2009-01-09 14:43:22 -08:00 |
|
Brian Behlendorf
|
ff09d64647
|
Pull all source in to be built, it will be ifdef'ed out as need by higher level topic branches
|
2009-01-09 14:37:45 -08:00 |
|
Brian Behlendorf
|
7b6040235d
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2009-01-09 14:30:32 -08:00 |
|
Brian Behlendorf
|
9ef637b057
|
Add minimum needed zvol bits
|
2009-01-09 14:28:50 -08:00 |
|
Brian Behlendorf
|
bd6fb32e4c
|
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
|
2009-01-09 14:19:25 -08:00 |
|
Brian Behlendorf
|
5e7aec0a54
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2009-01-09 14:18:43 -08:00 |
|
Brian Behlendorf
|
cb25e32a1c
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2009-01-09 14:18:38 -08:00 |
|
Brian Behlendorf
|
f4bef22e4e
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-01-09 14:18:26 -08:00 |
|
Brian Behlendorf
|
03a4aefbcf
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-01-09 14:18:25 -08:00 |
|
Brian Behlendorf
|
1e181bcb77
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2009-01-09 14:17:52 -08:00 |
|
Brian Behlendorf
|
e17f9cb711
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2009-01-09 14:17:50 -08:00 |
|
Brian Behlendorf
|
86eb46d20b
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2009-01-09 14:17:49 -08:00 |
|
Brian Behlendorf
|
6b32aaea67
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2009-01-09 14:17:49 -08:00 |
|
Brian Behlendorf
|
578c9645df
|
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
|
2009-01-09 14:17:48 -08:00 |
|
Brian Behlendorf
|
902ce659b0
|
Fix c90 compliance issue
|
2009-01-09 14:15:56 -08:00 |
|
Brian Behlendorf
|
9f52c74893
|
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
|
2009-01-09 14:07:24 -08:00 |
|
Brian Behlendorf
|
203d2b01b8
|
Make most of the vfsops conditional on ZPL support
|
2009-01-09 14:02:40 -08:00 |
|
Brian Behlendorf
|
e64d6361f7
|
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
|
2009-01-09 13:34:48 -08:00 |
|
Brian Behlendorf
|
980384b4bc
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2009-01-09 13:34:05 -08:00 |
|
Brian Behlendorf
|
887409fdc4
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2009-01-09 13:34:01 -08:00 |
|
Brian Behlendorf
|
d3d2ff38e8
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2009-01-09 13:33:50 -08:00 |
|
Brian Behlendorf
|
8d12e9b274
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-01-09 13:33:48 -08:00 |
|
Brian Behlendorf
|
bc5e2d8660
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-01-09 13:33:48 -08:00 |
|
Brian Behlendorf
|
bf5a93e1ec
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2009-01-09 13:33:14 -08:00 |
|
Brian Behlendorf
|
7357c92d76
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2009-01-09 13:33:12 -08:00 |
|
Brian Behlendorf
|
7a7a074d3d
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2009-01-09 13:33:11 -08:00 |
|
Brian Behlendorf
|
cd5e331e68
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2009-01-09 13:33:10 -08:00 |
|
Brian Behlendorf
|
953d302b87
|
Merge branch 'gcc-cast' into refs/top-bases/gcc-branch
|
2009-01-09 13:33:09 -08:00 |
|
Brian Behlendorf
|
04638ead67
|
Change zpool module name to zfs and update references
|
2009-01-09 13:31:16 -08:00 |
|
Brian Behlendorf
|
ca4fc6ef63
|
Fix cast
|
2009-01-09 13:29:41 -08:00 |
|
Brian Behlendorf
|
68585e71a8
|
Get correct exit prototype
|
2009-01-09 13:28:42 -08:00 |