Commit Graph

897 Commits

Author SHA1 Message Date
Brian Behlendorf 042deede25 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-01-13 15:02:49 -08:00
Brian Behlendorf 149c57fd06 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-01-13 15:02:15 -08:00
Brian Behlendorf acd48f80d9 Merge commit 'refs/top-bases/linux-arc' into linux-arc 2009-01-13 15:02:13 -08:00
Brian Behlendorf 60f5ac8ac7 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-01-13 15:02:12 -08:00
Brian Behlendorf 4a5bd7a3a8 Merge branch 'fix-branch' into refs/top-bases/zfs-branch 2009-01-13 15:02:11 -08:00
Brian Behlendorf 6c96fc31e9 Merge branch 'fix-list' into refs/top-bases/fix-branch 2009-01-13 15:02:10 -08:00
Brian Behlendorf bec036636e List cleanup and use of list_node_init initializer 2009-01-13 15:00:12 -08:00
Brian Behlendorf 6bc9ddf743 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-01-13 14:19:36 -08:00
Brian Behlendorf 4ef8421b03 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2009-01-13 14:19:13 -08:00
Brian Behlendorf 6ec00152b1 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-01-13 14:18:51 -08:00
Brian Behlendorf b289f6dd98 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-01-13 14:18:50 -08:00
Brian Behlendorf b052188ff6 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-01-13 14:18:16 -08:00
Brian Behlendorf 3b3a155dc4 Merge commit 'refs/top-bases/linux-arc' into linux-arc 2009-01-13 14:18:12 -08:00
Brian Behlendorf bdb0ce1a0d Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-01-13 14:18:11 -08:00
Brian Behlendorf 552c9e1abb Merge branch 'fix-branch' into refs/top-bases/zfs-branch 2009-01-13 14:18:10 -08:00
Brian Behlendorf c6f1eca44b Merge branch 'fix-list' into refs/top-bases/fix-branch 2009-01-13 14:18:09 -08:00
Brian Behlendorf 2ea04834bf Remove assertion for now 2009-01-13 14:16:11 -08:00
Brian Behlendorf 9fc1da9334 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-01-13 13:33:54 -08:00
Brian Behlendorf 323f4f67dd Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2009-01-13 13:33:31 -08:00
Brian Behlendorf 43b31e2884 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-01-13 13:33:10 -08:00
Brian Behlendorf 935c8157f9 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-01-13 13:33:09 -08:00
Brian Behlendorf bad8fae24d Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-01-13 13:32:36 -08:00
Brian Behlendorf 6eb210ddfe Merge commit 'refs/top-bases/linux-arc' into linux-arc 2009-01-13 13:32:32 -08:00
Brian Behlendorf f8b66dcc4f Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-01-13 13:32:31 -08:00
Brian Behlendorf 8ad629750e Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2009-01-13 13:32:30 -08:00
Brian Behlendorf bb9b10a830 Merge branch 'gcc-c90' into refs/top-bases/gcc-branch 2009-01-13 13:32:29 -08:00
Brian Behlendorf b73b29ab8e Fix c90 issue with { } 2009-01-13 13:30:35 -08:00
Brian Behlendorf a0f86c6571 Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2009-01-13 12:32:07 -08:00
Brian Behlendorf 6c2e910597 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-01-13 12:32:03 -08:00
Brian Behlendorf 5a36a4b40b Pull in needed hunk from old patch stack for a ZFS build without the ZPL support 2009-01-13 12:28:26 -08:00
Brian Behlendorf f15ef90618 Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch 2009-01-13 11:18:11 -08:00
Brian Behlendorf 7356c2045e Update zpios.sh script to reference zfs not zpool, additionally remove unneed module load console message 2009-01-13 11:16:12 -08:00
Brian Behlendorf 13ab1d30be Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2009-01-09 16:53:53 -08:00
Brian Behlendorf 58df2601b0 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-01-09 16:53:49 -08:00
Brian Behlendorf 3977cefecc Update load/unload message, mknod /dev/zfs when udev is unavailable 2009-01-09 16:50:28 -08:00
Brian Behlendorf bd06c6eb0e Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2009-01-09 16:41:50 -08:00
Brian Behlendorf cd56628b75 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-01-09 16:41:46 -08:00
Brian Behlendorf 7001fd57fa Register sensible init/fini hooks 2009-01-09 16:38:13 -08:00
Brian Behlendorf 1ccec67674 Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2009-01-09 16:32:13 -08:00
Brian Behlendorf b19ccd10af Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-01-09 16:32:09 -08:00
Brian Behlendorf d9a45283ce Add ZFS load/unload console messages 2009-01-09 16:28:26 -08:00
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 7ea7020636 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-01-09 14:46:27 -08:00
Brian Behlendorf d7e52cccea Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2009-01-09 14:46:05 -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 cdba663ce4 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-01-09 14:19:11 -08:00
Brian Behlendorf ccb1f1c5d4 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2009-01-09 14:18:47 -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 6b32aaea67 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2009-01-09 14:17:49 -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 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 82d446c832 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-01-09 13:34:34 -08:00
Brian Behlendorf b881b78bc9 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2009-01-09 13:34:10 -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
Brian Behlendorf 711774c008 Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch 2009-01-09 13:01:22 -08:00
Brian Behlendorf f1549b9636 Take tsd_* functions out for now, we need it for the ZPL later 2009-01-09 12:53:37 -08:00
Brian Behlendorf 0ae94a5f86 Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-01-09 12:50:45 -08:00
Brian Behlendorf b77b7a4741 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-01-09 12:50:10 -08:00
Brian Behlendorf 613eaeb74b Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2009-01-09 12:49:14 -08:00
Brian Behlendorf 0963498e86 Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2009-01-09 12:49:00 -08:00
Brian Behlendorf 786b3d6b88 Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2009-01-09 12:48:49 -08:00
Brian Behlendorf fb1f1596c7 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-01-09 12:48:19 -08:00
Brian Behlendorf 18f3ecb485 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-01-09 12:48:17 -08:00
Brian Behlendorf f5a274607e Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-01-09 12:46:56 -08:00
Brian Behlendorf 97ad681fc7 Merge commit 'refs/top-bases/linux-arc' into linux-arc 2009-01-09 12:46:46 -08:00
Brian Behlendorf 129afe3ce8 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-01-09 12:46:44 -08:00
Brian Behlendorf b4d27767d8 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2009-01-09 12:46:42 -08:00
Brian Behlendorf b3064162aa Merge branch 'gcc-missing-case' into refs/top-bases/gcc-branch 2009-01-09 12:46:40 -08:00
Brian Behlendorf cb5fc9440b Remove extra defaults 2009-01-09 12:42:27 -08:00
Brian Behlendorf e2e5e6e16a Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2009-01-09 11:44:49 -08:00
Brian Behlendorf 3bed287e00 Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2009-01-09 11:44:37 -08:00
Brian Behlendorf 37cdc79b95 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-01-09 11:44:34 -08:00
Brian Behlendorf f0f1f7362d Remove invalid tunable 2009-01-09 11:42:31 -08:00
Brian Behlendorf e39cb8adab Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2009-01-09 11:31:53 -08:00
Brian Behlendorf 6b4205fe71 Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2009-01-09 11:31:42 -08:00
Brian Behlendorf f612969bdf Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-01-09 11:31:40 -08:00
Brian Behlendorf dd50143ea1 Add module load/unload entry point hooks and ioctl integration 2009-01-09 11:21:59 -08:00
Brian Behlendorf 2f1ba85948 Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch 2009-01-09 11:17:59 -08:00
Brian Behlendorf be9f92ecd6 Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch 2009-01-09 11:17:57 -08:00
Brian Behlendorf 7902b5fdf1 Add HAVE_ZVOL wrappers 2009-01-09 11:16:01 -08:00
Brian Behlendorf 86a5af4d25 Update HAVE_ZPL bits for zfs_ioctl 2009-01-09 11:13:22 -08:00
Brian Behlendorf 469bd888eb Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-01-09 09:23:30 -08:00
Brian Behlendorf 5a04b50177 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-01-09 09:23:15 -08:00
Brian Behlendorf 8cd72da031 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2009-01-09 09:22:49 -08:00
Brian Behlendorf 8bb10f0528 Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2009-01-09 09:22:44 -08:00
Brian Behlendorf 00aa3c2f3d Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2009-01-09 09:22:39 -08:00
Brian Behlendorf 1a106f9b4e Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-01-09 09:22:25 -08:00
Brian Behlendorf ed92da1e4e Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-01-09 09:22:24 -08:00
Brian Behlendorf 110393189c Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-01-09 09:21:47 -08:00
Brian Behlendorf a534a8bd1f Merge commit 'refs/top-bases/linux-arc' into linux-arc 2009-01-09 09:21:36 -08:00
Brian Behlendorf 91b9bf3f40 Pulling zvol, zfs_vfsops, and zfs_ioctl to resolve those build issues 2009-01-09 09:19:33 -08:00
Brian Behlendorf b573210ad0 Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 2009-01-08 10:28:44 -08:00
Brian Behlendorf b38c50ac45 Update vdev_disk.c implementation to be compatible with b103 API 2009-01-08 10:25:23 -08:00
Brian Behlendorf f1cf255273 Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-01-07 15:53:39 -08:00
Brian Behlendorf a362b45dc6 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-01-07 15:53:23 -08:00
Brian Behlendorf 4faa6ff9df Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2009-01-07 15:52:56 -08:00
Brian Behlendorf 47f55fd79b Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2009-01-07 15:52:51 -08:00
Brian Behlendorf 1aab10f3c8 Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2009-01-07 15:52:46 -08:00
Brian Behlendorf cf6efb2639 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-01-07 15:52:32 -08:00
Brian Behlendorf 53a6418874 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-01-07 15:52:31 -08:00
Brian Behlendorf 1c5ae9851b Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-01-07 15:51:51 -08:00
Brian Behlendorf c9ef10893b Merge commit 'refs/top-bases/linux-arc' into linux-arc 2009-01-07 15:51:40 -08:00
Brian Behlendorf 2a76f03369 Update distfiles 2009-01-07 15:49:36 -08:00
Brian Behlendorf 87313883ac Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch 2009-01-07 15:29:12 -08:00
Brian Behlendorf 12a4048370 Enable zfs_create_fs to operate without the VFS 2009-01-07 15:26:04 -08:00
Brian Behlendorf 4121b581e9 Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-01-06 13:46:56 -08:00
Brian Behlendorf d92e9fd833 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-01-06 13:46:44 -08:00