Commit Graph

891 Commits

Author SHA1 Message Date
Brian Behlendorf 98674d530a Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 2009-01-26 16:50:32 -08:00
Brian Behlendorf 3657ada547 Update linux vdev_disk interfaces to issue multiple bios if needed due to the maximum request size being smaller than the request size passed down from the spa 2009-01-26 16:46:50 -08:00
Brian Behlendorf 92dce85827 Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 2009-01-21 11:02:12 -08:00
Brian Behlendorf ab8f4ca43f Convert ASSERT() to VERIFY() for better coverage 2009-01-21 10:59:06 -08:00
Brian Behlendorf 8ff964a4f3 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2009-01-15 16:33:09 -08:00
Brian Behlendorf 37cc2cedde Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-01-15 16:30:38 -08:00
Brian Behlendorf b8e5edb299 Merge commit 'refs/top-bases/linux-arc' into linux-arc 2009-01-15 16:30:32 -08:00
Brian Behlendorf fb256294c9 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-01-15 16:30:29 -08:00
Brian Behlendorf c5b335f613 Merge branch 'fix-branch' into refs/top-bases/zfs-branch 2009-01-15 16:30:28 -08:00
Brian Behlendorf 31cddc8a0b Merge branch 'fix-locks' into refs/top-bases/fix-branch 2009-01-15 16:30:25 -08:00
Brian Behlendorf 50186c2b57 All init and destroy initialized pulled in 2009-01-15 16:25:25 -08:00
Brian Behlendorf 7d4fe54632 txg_init/txg_fini cv_* initialized pulled in upstream in a slightly different way, drop these now redundant versions 2009-01-15 16:22:23 -08:00
Brian Behlendorf 461fe17e5f Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2009-01-15 15:30:20 -08:00
Brian Behlendorf 15cd579536 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-01-15 15:29:18 -08:00
Brian Behlendorf 2e84c7ae79 Merge commit 'refs/top-bases/linux-arc' into linux-arc 2009-01-15 15:29:16 -08:00
Brian Behlendorf 8511545409 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-01-15 15:29:15 -08:00
Brian Behlendorf fa36244fba Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2009-01-15 15:29:14 -08:00
Brian Behlendorf 4c0be07ad9 Merge branch 'gcc-c90' into refs/top-bases/gcc-branch 2009-01-15 15:29:13 -08:00
Brian Behlendorf 22284754e0 Resolve C90 int declared in for() construct 2009-01-15 15:26:54 -08:00
Brian Behlendorf 41c372fa3f Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2009-01-15 14:53:14 -08:00
Brian Behlendorf 2763e879ec Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-01-15 14:52:08 -08:00
Brian Behlendorf b7f8d6e829 Merge commit 'refs/top-bases/linux-arc' into linux-arc 2009-01-15 14:52:06 -08:00
Brian Behlendorf 63722ea81a Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-01-15 14:52:04 -08:00
Brian Behlendorf 12fb73609c Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2009-01-15 14:52:04 -08:00
Brian Behlendorf e23dbee181 Merge branch 'gcc-c90' into refs/top-bases/gcc-branch 2009-01-15 14:52:03 -08:00
Brian Behlendorf b61295bfb6 Resolve C90 int declared in for() construct 2009-01-15 14:49:42 -08:00
Brian Behlendorf a74bc899dc Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2009-01-15 14:39:42 -08:00
Brian Behlendorf 0f392008db Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-01-15 14:38:41 -08:00
Brian Behlendorf fe7a703285 Merge commit 'refs/top-bases/linux-arc' into linux-arc 2009-01-15 14:38:39 -08:00
Brian Behlendorf 3b6c91ec9f Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-01-15 14:38:38 -08:00
Brian Behlendorf ec41b57eb3 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2009-01-15 14:38:38 -08:00
Brian Behlendorf e9c7a643f1 Merge branch 'gcc-c90' into refs/top-bases/gcc-branch 2009-01-15 14:38:37 -08:00
Brian Behlendorf 77f365172c Resolve C90 int declared in for() construct 2009-01-15 14:36:27 -08:00
Brian Behlendorf 7dd685ccc3 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2009-01-15 14:30:14 -08:00
Brian Behlendorf b83cf899ca Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-01-15 14:29:13 -08:00
Brian Behlendorf 062f1f78c6 Merge commit 'refs/top-bases/linux-arc' into linux-arc 2009-01-15 14:29:11 -08:00
Brian Behlendorf cb55f9a832 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-01-15 14:29:11 -08:00
Brian Behlendorf 43b4c537eb Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2009-01-15 14:29:10 -08:00
Brian Behlendorf f969333c73 Merge branch 'gcc-c90' into refs/top-bases/gcc-branch 2009-01-15 14:29:09 -08:00
Brian Behlendorf c4fc002c87 Resolve C90 int declared in for() construct 2009-01-15 14:26:52 -08:00
Brian Behlendorf 465b2c795d Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2009-01-15 14:21:24 -08:00
Brian Behlendorf 1f372d9030 Resolve conflict with removed cleaner type 2009-01-15 14:18:01 -08:00
Brian Behlendorf 8684f3ea64 Merge commit 'refs/top-bases/linux-arc' into linux-arc 2009-01-15 14:16:25 -08:00
Brian Behlendorf ddaad20220 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-01-15 14:16:23 -08:00
Brian Behlendorf 089836c3e4 Resolve conflict with removed cleaner type 2009-01-15 14:14:57 -08:00
Brian Behlendorf 551838a6c8 Resolve conflict with removed cleaner type 2009-01-15 14:13:39 -08:00
Brian Behlendorf b633e4f669 Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap 2009-01-15 14:11:26 -08:00
Brian Behlendorf da7151a89e Resolve conflict with removed cleaner type 2009-01-15 14:11:19 -08:00
Brian Behlendorf 3fa768e21b Resolve conflict with removed cleaner type 2009-01-15 14:04:35 -08:00
Brian Behlendorf d3df6b2012 Merge commit 'refs/top-bases/gcc-c90' into gcc-c90 2009-01-15 14:01:51 -08:00