Commit Graph

2161 Commits

Author SHA1 Message Date
Brian Behlendorf 04aa3d5ef9 Header aclutils.h only needed by idmap. 2009-07-07 14:41:19 -07:00
Brian Behlendorf 678b02cd8e Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap 2009-07-07 14:32:59 -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 81729c2c73 Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap 2009-07-07 14:14:24 -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
Brian Behlendorf a2423197e1 Resolve missing cast warning 2009-07-07 13:41:51 -07:00
Brian Behlendorf 361e0e7685 Fix newly introduced missing braces warnings for gcc. 2009-07-07 13:40:16 -07:00
Brian Behlendorf 9661d38088 Add topic branch to conditionally remove idmap support. The
only things currently like this on linux appears in the nfs v4
implementation of idmap.  For now we can do with out.
2009-07-07 13:16:24 -07:00
Brian Behlendorf 69b2257940 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-07-06 15:38:51 -07:00
Brian Behlendorf 8463b9e01e Merge branch 'feature-branch' into refs/top-bases/zfs-branch 2009-07-06 15:38:50 -07:00
Brian Behlendorf 4272b9e492 Merge commit 'refs/top-bases/feature-branch' into feature-branch 2009-07-06 15:38:49 -07:00
Brian Behlendorf 1f5a1d932e Merge branch 'feature-pthreads' into refs/top-bases/feature-branch 2009-07-06 15:38:48 -07:00
Brian Behlendorf 3a8e684d73 Additional lock calls were added to ztest and they must be updated
to use the pthread's API in favour of Solaris threads.
2009-07-06 15:31:54 -07:00
Brian Behlendorf 658459249e Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-07-06 13:17:28 -07:00
Brian Behlendorf 926b04acba Merge branch 'feature-branch' into refs/top-bases/zfs-branch
Conflicts:

	cmd/ztest/ztest.c
2009-07-06 13:17:16 -07:00
Brian Behlendorf 8d4f19348a Merge commit 'refs/top-bases/feature-branch' into feature-branch 2009-07-06 13:16:34 -07:00
Brian Behlendorf 2838dba2c4 Merge branch 'feature-pthreads' into refs/top-bases/feature-branch 2009-07-06 13:16:32 -07:00
Brian Behlendorf cd098f87c8 Merge commit 'refs/top-bases/feature-pthreads' into feature-pthreads
Conflicts:

	cmd/ztest/ztest.c
2009-07-06 13:16:29 -07:00
Brian Behlendorf 8795d8f034 Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb 2009-07-06 13:15:43 -07:00
Brian Behlendorf 95ba24ed69 Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch
Conflicts:

	cmd/ztest/ztest.c
2009-07-06 13:15:35 -07:00
Brian Behlendorf d369760713 Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key 2009-07-06 13:14:41 -07:00
Brian Behlendorf 4e59805d98 Merge branch 'fix-branch' into refs/top-bases/zfs-branch 2009-07-06 13:14:36 -07:00
Brian Behlendorf 4ac493854e Merge commit 'refs/top-bases/fix-branch' into fix-branch 2009-07-06 13:14:20 -07:00
Brian Behlendorf 1851e0622f Merge branch 'fix-deadcode' into refs/top-bases/fix-branch 2009-07-06 13:14:18 -07:00
Brian Behlendorf f6c61972e1 Merge commit 'refs/top-bases/fix-deadcode' into fix-deadcode 2009-07-06 13:14:18 -07:00
Brian Behlendorf ab14c47f14 Merge branch 'fix-strncat' into refs/top-bases/fix-branch 2009-07-06 13:14:13 -07:00
Brian Behlendorf 4de6678930 Merge commit 'refs/top-bases/fix-strncat' into fix-strncat 2009-07-06 13:14:13 -07:00
Brian Behlendorf 5ab66031b7 Merge branch 'fix-list' into refs/top-bases/fix-branch 2009-07-06 13:14:08 -07:00
Brian Behlendorf b21412b008 Merge commit 'refs/top-bases/fix-list' into fix-list
Conflicts:

	module/zfs/zil.c
2009-07-06 13:14:05 -07:00
Brian Behlendorf 02edd0ffc1 Merge branch 'fix-taskq' into refs/top-bases/fix-branch 2009-07-06 13:13:25 -07:00
Brian Behlendorf 4539acb1cd Merge commit 'refs/top-bases/fix-taskq' into fix-taskq 2009-07-06 13:13:25 -07:00
Brian Behlendorf c186eae4b9 Merge branch 'fix-stack' into refs/top-bases/fix-branch 2009-07-06 13:13:20 -07:00
Brian Behlendorf 326bb586bd Merge commit 'refs/top-bases/fix-stack' into fix-stack 2009-07-06 13:13:20 -07:00
Brian Behlendorf 4749932f63 Merge branch 'fix-rwlocks' into refs/top-bases/fix-branch 2009-07-06 13:13:15 -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 ac96ab67ed Merge branch 'fix-no-zmod' into refs/top-bases/fix-branch 2009-07-06 13:13:05 -07:00
Brian Behlendorf f3dc6d4e58 Merge commit 'refs/top-bases/fix-no-zmod' into fix-no-zmod 2009-07-06 13:13:05 -07:00
Brian Behlendorf 6f31ab380c Merge branch 'fix-newlines' into refs/top-bases/fix-branch 2009-07-06 13:12:59 -07:00
Brian Behlendorf 9f1627af07 Merge commit 'refs/top-bases/fix-newlines' into fix-newlines 2009-07-06 13:12:59 -07:00
Brian Behlendorf e320858042 Merge commit 'refs/top-bases/fix-get-configs' into fix-get-configs 2009-07-06 13:12:54 -07:00
Brian Behlendorf ea95d72db5 Merge branch 'fix-get-configs' into refs/top-bases/fix-branch 2009-07-06 13:12:54 -07:00