Commit Graph

2444 Commits

Author SHA1 Message Date
Brian Behlendorf 058a25a017 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-07-08 15:00:43 -07:00
Brian Behlendorf 275d66171b Merge branch 'feature-branch' into refs/top-bases/zfs-branch 2009-07-08 15:00:41 -07:00
Brian Behlendorf 151315f7cb Merge commit 'refs/top-bases/feature-branch' into feature-branch 2009-07-08 15:00:40 -07:00
Brian Behlendorf fa35bfd3cf Merge branch 'feature-pthreads' into refs/top-bases/feature-branch 2009-07-08 15:00:39 -07:00
Brian Behlendorf 57ae3b59e9 Merge commit 'refs/top-bases/feature-pthreads' into feature-pthreads 2009-07-08 15:00:39 -07:00
Brian Behlendorf 2caba8e240 Add new DMU_READ_PREFETCH flag to dmu_read(). 2009-07-08 14:51:55 -07:00
Brian Behlendorf 1ab1b8502b Stop the kthread/thread/pthread mixing and matching insanity. Update all
code to only use the kthread API regardless of if it is compiled in the
kernel or user space.  The kthread API will be layered on top of pthreads
as best as possible in zfs_context, this is non optimal but much clearer.
2009-07-08 14:47:23 -07:00
Brian Behlendorf 0242cb33fe Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2009-07-08 09:19:31 -07:00
Brian Behlendorf 33077ad631 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-07-08 09:16:05 -07:00
Brian Behlendorf f00e6fe5c3 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2009-07-08 09:16:04 -07:00
Brian Behlendorf a8ce5c16d6 Merge commit 'refs/top-bases/gcc-branch' into gcc-branch 2009-07-08 09:16:03 -07:00
Brian Behlendorf 23cff295e2 Merge branch 'gcc-cast' into refs/top-bases/gcc-branch 2009-07-08 09:16:02 -07:00
Brian Behlendorf 5fc46112cb Merge branch 'gcc-c90' into refs/top-bases/gcc-branch 2009-07-08 09:16:01 -07:00
Brian Behlendorf b2e459dab0 Add explicit casts for (u_longlong_t) when printing uint64_t. 2009-07-08 09:07:13 -07:00
Brian Behlendorf 5534447477 Add explicit casts for (u_longlong_t) when printing uint64_t. 2009-07-08 09:06:03 -07:00
Brian Behlendorf 58f5e63293 Resolve a 2 new cases of for loop variable declared in for() 2009-07-08 09:05:37 -07:00
Brian Behlendorf b2dcbdf490 Resolve a 2 new cases of for loop variable declared in for() 2009-07-08 09:04:21 -07:00
Brian Behlendorf e192fc13d7 Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2009-07-07 16:34:02 -07:00
Brian Behlendorf 0a00d10c24 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-07-07 16:30:57 -07:00
Brian Behlendorf 02362668ac Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2009-07-07 16:30:56 -07:00
Brian Behlendorf d515750ecf Merge commit 'refs/top-bases/gcc-branch' into gcc-branch 2009-07-07 16:30:55 -07:00
Brian Behlendorf 24daf7747f Merge branch 'gcc-unused' into refs/top-bases/gcc-branch 2009-07-07 16:30:54 -07:00
Brian Behlendorf 0e310d30de Merge branch 'gcc-missing-case' into refs/top-bases/gcc-branch 2009-07-07 16:30:54 -07:00
Brian Behlendorf 10dcf485d3 First fit allocator unused comment it out. 2009-07-07 16:23:09 -07:00
Brian Behlendorf ebda366c1c Add missing case introduced by rebase. 2009-07-07 16:22:33 -07:00
Brian Behlendorf 2eeed27184 Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2009-07-07 16:12:13 -07:00
Brian Behlendorf c460e5edb0 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-07-07 16:09:15 -07:00
Brian Behlendorf 04a83f2337 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2009-07-07 16:09:13 -07:00
Brian Behlendorf 19f57f1ae4 Merge commit 'refs/top-bases/gcc-branch' into gcc-branch 2009-07-07 16:09:12 -07:00
Brian Behlendorf 55b864f19b Merge branch 'gcc-no-parenthesis' into refs/top-bases/gcc-branch 2009-07-07 16:09:12 -07:00
Brian Behlendorf f80f59f955 Add missing paranthesis for gcc. 2009-07-07 16:01:13 -07:00
Brian Behlendorf aee7b2d2fd Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2009-07-07 15:53:29 -07:00
Brian Behlendorf e5c8fcd6b0 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-07-07 15:50:14 -07:00
Brian Behlendorf c75167c985 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2009-07-07 15:50:13 -07:00
Brian Behlendorf 33e5b3832f Merge commit 'refs/top-bases/gcc-branch' into gcc-branch 2009-07-07 15:50:12 -07:00
Brian Behlendorf 07a6b68575 Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch 2009-07-07 15:50:11 -07:00
Brian Behlendorf 7373ddf55f hash_lock should always be initialized 2009-07-07 15:41:19 -07:00
Brian Behlendorf f098b7f8fc Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2009-07-07 14:31:28 -07:00
Brian Behlendorf 3ad5361df2 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-07-07 14:28:14 -07:00
Brian Behlendorf ba97ae2628 Merge branch 'fix-branch' into refs/top-bases/zfs-branch 2009-07-07 14:28:13 -07:00
Brian Behlendorf a4f435b51a Merge commit 'refs/top-bases/fix-branch' into fix-branch 2009-07-07 14:19:36 -07:00
Brian Behlendorf ed3bd6f446 Merge branch 'fix-acl' into refs/top-bases/fix-branch 2009-07-07 14:19:35 -07:00
Brian Behlendorf 5bcfa12766 New TopGit dependency: fix-acl 2009-07-07 14:19:31 -07:00
Brian Behlendorf 798cf63309 New topic branch for minor acl related fixes 2009-07-07 14:18:47 -07:00
Brian Behlendorf c284220615 Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2009-07-07 14:12:50 -07:00
Brian Behlendorf 34422f0ffa Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-07-07 13:50:32 -07:00
Brian Behlendorf 47502cd94b Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2009-07-07 13:50:31 -07:00
Brian Behlendorf 1d8ef486a8 Merge commit 'refs/top-bases/gcc-branch' into gcc-branch 2009-07-07 13:50:30 -07:00
Brian Behlendorf fb26df15c8 Merge branch 'gcc-missing-braces' into refs/top-bases/gcc-branch 2009-07-07 13:50:30 -07:00
Brian Behlendorf cad9fa40e1 Merge branch 'gcc-cast' into refs/top-bases/gcc-branch 2009-07-07 13:50:29 -07:00