Commit Graph

160 Commits

Author SHA1 Message Date
Brian Behlendorf 071662bf32 Remove unused variable 2009-03-11 22:14:08 -07:00
Brian Behlendorf 9326966d34 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-03-11 21:02:37 -07:00
Brian Behlendorf 4c042de40b Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-03-11 20:59:43 -07:00
Brian Behlendorf 60ac8152fe Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2009-03-11 20:59:42 -07:00
Brian Behlendorf 9915249546 Merge branch 'gcc-missing-braces' into refs/top-bases/gcc-branch 2009-03-11 20:53:11 -07:00
Brian Behlendorf d4dbc7dca8 Resolve all instances of missing braces. 2009-03-11 20:52:21 -07:00
Brian Behlendorf bd92e256e6 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-03-11 14:12:52 -07:00
Brian Behlendorf 1ca6578ebc Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-03-11 14:08:51 -07:00
Brian Behlendorf 8a3b1a5ff5 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2009-03-11 14:08:50 -07:00
Brian Behlendorf e5011401cd Merge branch 'gcc-no-parenthesis' into refs/top-bases/gcc-branch 2009-03-11 14:08:48 -07:00
Brian Behlendorf 3226eea157 Resolve additional cases where gcc wants extra parenthesis.
These were introduced by the rebase to b108.
2009-03-11 13:57:47 -07:00
Brian Behlendorf a55824aa6a Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-03-11 11:20:15 -07:00
Brian Behlendorf dff484a388 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-03-11 11:09:13 -07:00
Brian Behlendorf 5f30a3cb0e Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2009-03-11 11:09:11 -07:00
Brian Behlendorf 8fe801fd8f Merge branch 'gcc-ident-pragmas' into refs/top-bases/gcc-branch 2009-03-11 11:00:42 -07:00
Ricardo M. Correia af45030850 Added 'gcc-ident-pragmas' branch. 2009-03-11 10:59:45 -07:00
Brian Behlendorf 2d756b5ea3 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-03-11 10:44:10 -07:00
Brian Behlendorf 8eaf19dae8 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-03-11 10:40:33 -07:00
Brian Behlendorf d43e9ca262 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2009-03-11 10:40:31 -07:00
Brian Behlendorf d641369d38 Merge branch 'gcc-64bit-constants' into refs/top-bases/gcc-branch 2009-03-11 10:32:45 -07:00
Ricardo M. Correia fd9a7a0fb4 Add 'ull' suffix to 64-bit constants. 2009-03-11 10:31:24 -07:00
Brian Behlendorf ddfa570f42 Initial update to support zpios.sh profiling option. 2009-02-19 14:51:40 -08:00
Brian Behlendorf 5ae73585fb Cleanup zpios option handling 2009-02-19 13:53:17 -08:00
Brian Behlendorf 23710f1308 Minor zpios cleanup plus addition of --nowait feature 2009-02-19 12:56:50 -08:00
Brian Behlendorf b3d7657ea0 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-02-18 14:37:01 -08:00
Brian Behlendorf 7872d84be6 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-02-18 14:30:54 -08:00
Brian Behlendorf f0a8aedfbc Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
Conflicts:

	lib/libzpool/kernel.c
	module/zfs/arc.c
2009-02-18 14:27:12 -08:00
Brian Behlendorf f686a87058 Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
Conflicts:

	module/zfs/arc.c
2009-02-18 13:12:26 -08:00
Brian Behlendorf 3b17164f71 Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
Conflicts:

	module/zfs/vdev.c
	module/zfs/zio.c
2009-02-18 13:09:32 -08:00
Brian Behlendorf d164b20935 Rebase master to b108 2009-02-18 12:51:31 -08:00
Brian Behlendorf 68346c54fe Misnamed --load option sff changed to ssf 2009-02-13 12:07:34 -08:00
Brian Behlendorf 4144f1ed75 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-01-15 15:56:09 -08:00
Brian Behlendorf 85c77e1c82 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-01-15 15:54:35 -08:00
Brian Behlendorf ee7f10a6b3 Merge branch 'fix-branch' into refs/top-bases/zfs-branch 2009-01-15 15:54:34 -08:00
Brian Behlendorf cf9a5530e1 Fix pthreads prototype 2009-01-15 15:52:12 -08:00
Brian Behlendorf 4662f38b69 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-01-15 15:42:10 -08:00
Brian Behlendorf 0197f3a298 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-01-15 15:40:39 -08:00
Brian Behlendorf 975c613269 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2009-01-15 15:40:39 -08:00
Brian Behlendorf 51730cdeae Merge branch 'gcc-c90' into refs/top-bases/gcc-branch 2009-01-15 15:40:37 -08:00
Brian Behlendorf 37a3478d58 Resolve C90 int declared in for() construct 2009-01-15 15:38:26 -08:00
Brian Behlendorf de66052064 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-01-15 14:21:55 -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 a42707fcc0 Resolve conflict with removed cleaner type 2009-01-15 14:16:03 -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
Brian Behlendorf fb5f0bc833 Rebase master to b105 2009-01-15 13:59:39 -08:00
Brian Behlendorf 9339984f08 Resolve conflict 2009-01-14 16:04:33 -08:00
Brian Behlendorf 9c22d76019 Minor 'make check' updates 2009-01-14 15:38:56 -08:00
Brian Behlendorf 1194e0412f Change all instances of kpios to zpios 2009-01-14 08:38:35 -08:00