Commit Graph

242 Commits

Author SHA1 Message Date
Brian Behlendorf df809b8ca1 Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2009-01-13 16:08:23 -08:00
Brian Behlendorf 04d7ae5f22 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-01-13 16:06:28 -08:00
Brian Behlendorf c186f81c6d Merge branch 'fix-branch' into refs/top-bases/zfs-branch 2009-01-13 16:06:26 -08:00
Brian Behlendorf e1632568f1 Merge branch 'fix-list' into refs/top-bases/fix-branch 2009-01-13 16:06:23 -08:00
Brian Behlendorf be0b4029db Initialize list links 2009-01-13 16:02:19 -08:00
Brian Behlendorf 12e5cfca38 Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2009-01-13 15:34:56 -08:00
Brian Behlendorf 32baeb1712 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-01-13 15:34:01 -08:00
Brian Behlendorf 0d6b81fcca Merge branch 'fix-branch' into refs/top-bases/zfs-branch 2009-01-13 15:34:00 -08:00
Brian Behlendorf 43cd437415 Merge branch 'fix-list' into refs/top-bases/fix-branch 2009-01-13 15:33:59 -08:00
Brian Behlendorf 94944fab96 Fix proper list node initialization 2009-01-13 15:31:58 -08:00
Brian Behlendorf c6a5786c2f Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2009-01-13 15:08:02 -08:00
Brian Behlendorf b14513e826 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-01-13 15:07:08 -08:00
Brian Behlendorf 4c31283afc Merge branch 'fix-branch' into refs/top-bases/zfs-branch 2009-01-13 15:07:07 -08:00
Brian Behlendorf 2e9cd667d0 Merge branch 'fix-rwlocks' into refs/top-bases/fix-branch 2009-01-13 15:07:06 -08:00
Brian Behlendorf fcd2296399 Additional rw_lock not being initialized cleaned in updated code 2009-01-13 15:05:02 -08:00
Brian Behlendorf 46f868c3c3 Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2009-01-13 15:03:07 -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 e67acb10c7 Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2009-01-13 14:19:08 -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 5299c3259f Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2009-01-13 13:33:26 -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 2f2ae376e8 ifdef out some zvol specific ioctls 2009-01-09 16:08:18 -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 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 9ef637b057 Add minimum needed zvol bits 2009-01-09 14:28:50 -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 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 980384b4bc Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2009-01-09 13:34:05 -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 0963498e86 Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2009-01-09 12:49:00 -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