Commit Graph

26 Commits

Author SHA1 Message Date
Brian Behlendorf 0d4d1a7861 Merge commit 'refs/top-bases/fix-rwlocks' into fix-rwlocks
Conflicts:
	module/zfs/dsl_dataset.c
2010-05-28 13:52:52 -07:00
Brian Behlendorf 428870ff73 Update core ZFS code from build 121 to build 141. 2010-05-28 13:45:14 -07:00
Brian Behlendorf 1a18829f86 Merge commit 'refs/top-bases/fix-rwlocks' into fix-rwlocks 2010-04-29 12:04:15 -07:00
Brian Behlendorf 3affbe6d7e Update nvpair's to include nv_alloc_fixed support 2010-04-29 11:59:41 -07:00
Brian Behlendorf 52867336be Merge commit 'refs/top-bases/fix-rwlocks' into fix-rwlocks 2010-04-29 10:41:36 -07:00
Brian Behlendorf fa42225a3d Add Solaris FMA style support 2010-04-29 10:37:15 -07:00
Brian Behlendorf 5bd6eac343 Merge commit 'refs/top-bases/fix-rwlocks' into fix-rwlocks 2010-01-08 11:39:22 -08:00
Brian Behlendorf 4cd8e49a69 Add .gitignore files to exclude build products 2010-01-08 11:35:17 -08:00
Brian Behlendorf 45b0c5f49c Merge commit 'refs/top-bases/fix-rwlocks' into fix-rwlocks 2009-11-15 16:26:45 -08:00
Brian Behlendorf 0aa61e8427 Remove zvol.c when updating in update-zfs.sh Linux version available. 2009-11-15 16:20:01 -08:00
Brian Behlendorf 169f50db79 Merge commit 'refs/top-bases/fix-rwlocks' into fix-rwlocks 2009-08-18 12:09:52 -07:00
Brian Behlendorf 45d1cae3b8 Rebase master to b121 2009-08-18 11:43:27 -07:00
Brian Behlendorf a1e0f402bf Merge commit 'refs/top-bases/fix-rwlocks' into fix-rwlocks 2009-07-06 13:13:14 -07:00
Brian Behlendorf 9babb37438 Rebase master to b117 2009-07-02 15:44:48 -07:00
Brian Behlendorf 56aabda0f9 Merge commit 'refs/top-bases/fix-rwlocks' into fix-rwlocks 2009-02-18 14:29:16 -08:00
Brian Behlendorf d164b20935 Rebase master to b108 2009-02-18 12:51:31 -08:00
Brian Behlendorf 7c80f43566 Merge commit 'refs/top-bases/fix-rwlocks' into fix-rwlocks 2009-01-15 14:16:06 -08:00
Brian Behlendorf fb5f0bc833 Rebase master to b105 2009-01-15 13:59:39 -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 c239bd53d2 Merge commit 'refs/top-bases/fix-rwlocks' into fix-rwlocks 2009-01-05 12:08:46 -08:00
Brian Behlendorf 42bcb36c89 Add unicode library 2009-01-05 12:03:23 -08:00
Brian Behlendorf 32a5a583a3 Merge commit 'refs/top-bases/fix-rwlocks' into fix-rwlocks 2008-12-11 14:25:22 -08:00
Brian Behlendorf a4076c7544 Script updates 2008-12-11 14:21:14 -08:00
Brian Behlendorf c4911ece24 Move library files to lib 2008-12-11 14:16:55 -08:00
Brian Behlendorf 206ceddde8 Merge commit 'refs/top-bases/fix-rwlocks' into fix-rwlocks 2008-12-11 11:26:49 -08:00
Brian Behlendorf 172bb4bd5e Move the world out of /zfs/ and seperate out module build tree 2008-12-11 11:08:09 -08:00