]> granicus.if.org Git - zfs/log
zfs
15 years agoMerge commit 'refs/top-bases/feature-branch' into feature-branch
Brian Behlendorf [Tue, 18 Aug 2009 19:10:49 +0000 (12:10 -0700)]
Merge commit 'refs/top-bases/feature-branch' into feature-branch

15 years agoMerge branch 'feature-pthreads' into refs/top-bases/feature-branch
Brian Behlendorf [Tue, 18 Aug 2009 19:10:47 +0000 (12:10 -0700)]
Merge branch 'feature-pthreads' into refs/top-bases/feature-branch

15 years agoMerge commit 'refs/top-bases/feature-pthreads' into feature-pthreads
Brian Behlendorf [Tue, 18 Aug 2009 19:10:47 +0000 (12:10 -0700)]
Merge commit 'refs/top-bases/feature-pthreads' into feature-pthreads

15 years agoMerge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb
Brian Behlendorf [Tue, 18 Aug 2009 19:10:43 +0000 (12:10 -0700)]
Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb

15 years agoMerge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch
Brian Behlendorf [Tue, 18 Aug 2009 19:10:38 +0000 (12:10 -0700)]
Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch

15 years agoMerge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key
Brian Behlendorf [Tue, 18 Aug 2009 19:10:36 +0000 (12:10 -0700)]
Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key

15 years agoRebase master to b121
Brian Behlendorf [Tue, 18 Aug 2009 18:43:27 +0000 (11:43 -0700)]
Rebase master to b121

15 years agoMerge commit 'refs/top-bases/feature-branch' into feature-branch
Brian Behlendorf [Tue, 4 Aug 2009 22:54:18 +0000 (15:54 -0700)]
Merge commit 'refs/top-bases/feature-branch' into feature-branch

15 years agoMerge branch 'feature-pthreads' into refs/top-bases/feature-branch
Brian Behlendorf [Tue, 4 Aug 2009 22:54:17 +0000 (15:54 -0700)]
Merge branch 'feature-pthreads' into refs/top-bases/feature-branch

15 years agoRevert kthreads based on pthread thread specific data due to failure.
Brian Behlendorf [Tue, 4 Aug 2009 22:42:24 +0000 (15:42 -0700)]
Revert kthreads based on pthread thread specific data due to failure.
With this patch applied I get the following failure 100% of the time,
I'd prefer to debug it and keep moving forward but I do not have the
time right now so I'm reverting the patch to the version which worked.
Ricardo please fix.

(gdb) bt
0  ztest_dmu_write_parallel (za=0x2aaaac898960) at
../../cmd/ztest/ztest.c:2566
1  0x0000000000405a79 in ztest_thread (arg=<value optimized out>)
    at ../../cmd/ztest/ztest.c:3862
2  0x00002b2e6a7a841d in zk_thread_helper (arg=<value optimized out>)
    at ../../lib/libzpool/kernel.c:131
3  0x000000379be06367 in start_thread (arg=<value optimized out>)
    at pthread_create.c:297
4  0x000000379b2d30ad in clone () from /lib64/libc.so.6

15 years agoMerge commit 'refs/top-bases/feature-branch' into feature-branch
Brian Behlendorf [Tue, 4 Aug 2009 21:39:04 +0000 (14:39 -0700)]
Merge commit 'refs/top-bases/feature-branch' into feature-branch

15 years agoMerge branch 'feature-pthreads' into refs/top-bases/feature-branch
Brian Behlendorf [Tue, 4 Aug 2009 21:39:04 +0000 (14:39 -0700)]
Merge branch 'feature-pthreads' into refs/top-bases/feature-branch

15 years agoRevert unneeded ztest_resume() prototype changes to match upstream.
Brian Behlendorf [Tue, 4 Aug 2009 21:29:50 +0000 (14:29 -0700)]
Revert unneeded ztest_resume() prototype changes to match upstream.

15 years agoReimplement user kthreads based on pthread thread specific data.
Ricardo M. Correia [Tue, 4 Aug 2009 20:55:15 +0000 (13:55 -0700)]
Reimplement user kthreads based on pthread thread specific data.
This resolves previous scalabily concerns about the cost of calling
curthread which previously required a list walk.  The kthread address
is now tracked as thread specific data which can be quickly returned.

Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
15 years agoMerge commit 'refs/top-bases/feature-branch' into feature-branch
Brian Behlendorf [Fri, 24 Jul 2009 18:08:41 +0000 (11:08 -0700)]
Merge commit 'refs/top-bases/feature-branch' into feature-branch

15 years agoMerge branch 'feature-pthreads' into refs/top-bases/feature-branch
Brian Behlendorf [Fri, 24 Jul 2009 18:08:40 +0000 (11:08 -0700)]
Merge branch 'feature-pthreads' into refs/top-bases/feature-branch

15 years agoChange VERIFY() into VERIFY3U() when creating threads in ztest, so that we can see...
Ricardo M. Correia [Fri, 24 Jul 2009 18:00:23 +0000 (11:00 -0700)]
Change VERIFY() into VERIFY3U() when creating threads in ztest, so that we can see the return code when it fails.

Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
15 years agoMerge commit 'refs/top-bases/feature-branch' into feature-branch
Brian Behlendorf [Tue, 14 Jul 2009 23:49:23 +0000 (16:49 -0700)]
Merge commit 'refs/top-bases/feature-branch' into feature-branch

15 years agoMerge branch 'feature-pthreads' into refs/top-bases/feature-branch
Brian Behlendorf [Tue, 14 Jul 2009 23:49:22 +0000 (16:49 -0700)]
Merge branch 'feature-pthreads' into refs/top-bases/feature-branch

15 years agoRemove debug printf
Brian Behlendorf [Tue, 14 Jul 2009 23:35:13 +0000 (16:35 -0700)]
Remove debug printf

15 years agoMerge commit 'refs/top-bases/feature-branch' into feature-branch
Brian Behlendorf [Tue, 14 Jul 2009 21:34:36 +0000 (14:34 -0700)]
Merge commit 'refs/top-bases/feature-branch' into feature-branch

15 years agoMerge branch 'feature-pthreads' into refs/top-bases/feature-branch
Brian Behlendorf [Tue, 14 Jul 2009 21:34:35 +0000 (14:34 -0700)]
Merge branch 'feature-pthreads' into refs/top-bases/feature-branch

15 years agoProvide correct kthread API semantics using pthreads.
Brian Behlendorf [Tue, 14 Jul 2009 21:16:26 +0000 (14:16 -0700)]
Provide correct kthread API semantics using pthreads.

The intent here is to fully remove the previous Solaris thread
implementation so we don't need to simulate both Solaris kernel
and user space thread APIs.  The few user space consumers of the
thread API have been updated to use the kthread API.  In order
to support this we needed to more fully support the kthread API
and that means not doing crazy things like casting a thread id
to a pointer and using that as was done before.  This first
implementation is not effecient but it does provide all the
corrent semantics.  If/when performance becomes and issue we
can and should just natively adopt pthreads which is portable.

Let me finish by saying I'm not proud of any of this and I would
love to see it improved.  However, this slow implementation does
at least provide all the correct kthread API semantics whereas
the previous method of casting the thread ID to a pointer was
dodgy at best.

15 years agoMerge commit 'refs/top-bases/feature-branch' into feature-branch
Brian Behlendorf [Wed, 8 Jul 2009 22:00:40 +0000 (15:00 -0700)]
Merge commit 'refs/top-bases/feature-branch' into feature-branch

15 years agoMerge branch 'feature-pthreads' into refs/top-bases/feature-branch
Brian Behlendorf [Wed, 8 Jul 2009 22:00:39 +0000 (15:00 -0700)]
Merge branch 'feature-pthreads' into refs/top-bases/feature-branch

15 years agoMerge commit 'refs/top-bases/feature-pthreads' into feature-pthreads
Brian Behlendorf [Wed, 8 Jul 2009 22:00:39 +0000 (15:00 -0700)]
Merge commit 'refs/top-bases/feature-pthreads' into feature-pthreads

15 years agoAdd new DMU_READ_PREFETCH flag to dmu_read().
Brian Behlendorf [Wed, 8 Jul 2009 21:51:55 +0000 (14:51 -0700)]
Add new DMU_READ_PREFETCH flag to dmu_read().

15 years agoStop the kthread/thread/pthread mixing and matching insanity. Update all
Brian Behlendorf [Wed, 8 Jul 2009 21:47:23 +0000 (14:47 -0700)]
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.

15 years agoMerge commit 'refs/top-bases/feature-branch' into feature-branch
Brian Behlendorf [Mon, 6 Jul 2009 22:38:49 +0000 (15:38 -0700)]
Merge commit 'refs/top-bases/feature-branch' into feature-branch

15 years agoMerge branch 'feature-pthreads' into refs/top-bases/feature-branch
Brian Behlendorf [Mon, 6 Jul 2009 22:38:48 +0000 (15:38 -0700)]
Merge branch 'feature-pthreads' into refs/top-bases/feature-branch

15 years agoAdditional lock calls were added to ztest and they must be updated
Brian Behlendorf [Mon, 6 Jul 2009 22:31:54 +0000 (15:31 -0700)]
Additional lock calls were added to ztest and they must be updated
to use the pthread's API in favour of Solaris threads.

15 years agoMerge commit 'refs/top-bases/feature-branch' into feature-branch
Brian Behlendorf [Mon, 6 Jul 2009 20:16:34 +0000 (13:16 -0700)]
Merge commit 'refs/top-bases/feature-branch' into feature-branch

15 years agoMerge branch 'feature-pthreads' into refs/top-bases/feature-branch
Brian Behlendorf [Mon, 6 Jul 2009 20:16:32 +0000 (13:16 -0700)]
Merge branch 'feature-pthreads' into refs/top-bases/feature-branch

15 years agoMerge commit 'refs/top-bases/feature-pthreads' into feature-pthreads
Brian Behlendorf [Mon, 6 Jul 2009 20:16:29 +0000 (13:16 -0700)]
Merge commit 'refs/top-bases/feature-pthreads' into feature-pthreads

Conflicts:

cmd/ztest/ztest.c

15 years agoMerge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb
Brian Behlendorf [Mon, 6 Jul 2009 20:15:43 +0000 (13:15 -0700)]
Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb

15 years agoMerge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch
Brian Behlendorf [Mon, 6 Jul 2009 20:15:35 +0000 (13:15 -0700)]
Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch

Conflicts:

cmd/ztest/ztest.c

15 years agoMerge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key
Brian Behlendorf [Mon, 6 Jul 2009 20:14:41 +0000 (13:14 -0700)]
Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key

15 years agoRebase master to b117
Brian Behlendorf [Thu, 2 Jul 2009 22:44:48 +0000 (15:44 -0700)]
Rebase master to b117

15 years agoMerge commit 'refs/top-bases/feature-branch' into feature-branch
Brian Behlendorf [Fri, 20 Mar 2009 16:29:17 +0000 (09:29 -0700)]
Merge commit 'refs/top-bases/feature-branch' into feature-branch

15 years agoMerge branch 'feature-pthreads' into refs/top-bases/feature-branch
Brian Behlendorf [Fri, 20 Mar 2009 16:29:17 +0000 (09:29 -0700)]
Merge branch 'feature-pthreads' into refs/top-bases/feature-branch

15 years agoMerge commit 'refs/top-bases/feature-pthreads' into feature-pthreads
Brian Behlendorf [Fri, 20 Mar 2009 16:29:16 +0000 (09:29 -0700)]
Merge commit 'refs/top-bases/feature-pthreads' into feature-pthreads

15 years agoFix uninitialized variable error in ztest_dmu_commit_callbacks()
Brian Behlendorf [Fri, 20 Mar 2009 16:20:49 +0000 (09:20 -0700)]
Fix uninitialized variable error in ztest_dmu_commit_callbacks()

15 years agoMerge commit 'refs/top-bases/feature-branch' into feature-branch
Brian Behlendorf [Fri, 20 Mar 2009 04:28:48 +0000 (21:28 -0700)]
Merge commit 'refs/top-bases/feature-branch' into feature-branch

15 years agoMerge branch 'feature-pthreads' into refs/top-bases/feature-branch
Brian Behlendorf [Fri, 20 Mar 2009 04:28:48 +0000 (21:28 -0700)]
Merge branch 'feature-pthreads' into refs/top-bases/feature-branch

15 years agoUpdate mutex_lock to pthread_mutex_lock for zcl->zcl_callback_locks.
Brian Behlendorf [Fri, 20 Mar 2009 04:21:35 +0000 (21:21 -0700)]
Update mutex_lock to pthread_mutex_lock for zcl->zcl_callback_locks.

15 years agoMerge commit 'refs/top-bases/feature-pthreads' into feature-pthreads
Brian Behlendorf [Fri, 20 Mar 2009 04:19:28 +0000 (21:19 -0700)]
Merge commit 'refs/top-bases/feature-pthreads' into feature-pthreads

15 years agoAdd extra () requested by gcc
Brian Behlendorf [Fri, 20 Mar 2009 04:18:54 +0000 (21:18 -0700)]
Add extra () requested by gcc

15 years agoMerge commit 'refs/top-bases/feature-branch' into feature-branch
Brian Behlendorf [Fri, 20 Mar 2009 03:51:18 +0000 (20:51 -0700)]
Merge commit 'refs/top-bases/feature-branch' into feature-branch

15 years agoMerge branch 'feature-pthreads' into refs/top-bases/feature-branch
Brian Behlendorf [Fri, 20 Mar 2009 03:51:18 +0000 (20:51 -0700)]
Merge branch 'feature-pthreads' into refs/top-bases/feature-branch

15 years agoNew TopGit dependency: feature-pthreads
Brian Behlendorf [Fri, 20 Mar 2009 03:51:17 +0000 (20:51 -0700)]
New TopGit dependency: feature-pthreads

15 years agoAdd 'feature-pthreads' branch to features branch.
Brian Behlendorf [Fri, 20 Mar 2009 03:49:52 +0000 (20:49 -0700)]
Add 'feature-pthreads' branch to features branch.

15 years agoAdd 'feature-commit-cb' branch for DMU commit callbacks.
Brian Behlendorf [Fri, 20 Mar 2009 03:30:14 +0000 (20:30 -0700)]
Add 'feature-commit-cb' branch for DMU commit callbacks.

15 years agoMerge commit 'refs/top-bases/feature-branch' into feature-branch
Brian Behlendorf [Wed, 18 Feb 2009 22:30:50 +0000 (14:30 -0800)]
Merge commit 'refs/top-bases/feature-branch' into feature-branch

15 years agoMerge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch
Brian Behlendorf [Wed, 18 Feb 2009 22:30:49 +0000 (14:30 -0800)]
Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch

15 years agoMerge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key
Brian Behlendorf [Wed, 18 Feb 2009 22:30:48 +0000 (14:30 -0800)]
Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key

15 years agoRebase master to b108
Brian Behlendorf [Wed, 18 Feb 2009 20:51:31 +0000 (12:51 -0800)]
Rebase master to b108

16 years agoMerge commit 'refs/top-bases/feature-branch' into feature-branch
Brian Behlendorf [Tue, 27 Jan 2009 06:01:15 +0000 (22:01 -0800)]
Merge commit 'refs/top-bases/feature-branch' into feature-branch

16 years agoMerge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch
Brian Behlendorf [Tue, 27 Jan 2009 06:01:15 +0000 (22:01 -0800)]
Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch

16 years agoMerge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key
Brian Behlendorf [Tue, 27 Jan 2009 06:01:15 +0000 (22:01 -0800)]
Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key

16 years agoRefresh type in topgit git://* reference
Brian Behlendorf [Tue, 27 Jan 2009 05:58:32 +0000 (21:58 -0800)]
Refresh type in topgit git://* reference

16 years agoMerge commit 'refs/top-bases/feature-branch' into feature-branch
Brian Behlendorf [Tue, 20 Jan 2009 23:46:27 +0000 (15:46 -0800)]
Merge commit 'refs/top-bases/feature-branch' into feature-branch

16 years agoMerge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch
Brian Behlendorf [Tue, 20 Jan 2009 23:46:26 +0000 (15:46 -0800)]
Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch

16 years agoMerge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key
Brian Behlendorf [Tue, 20 Jan 2009 23:46:26 +0000 (15:46 -0800)]
Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key

16 years agoAdd GIT to master
Brian Behlendorf [Tue, 20 Jan 2009 23:43:44 +0000 (15:43 -0800)]
Add GIT to master

16 years agoMerge commit 'refs/top-bases/feature-branch' into feature-branch
Brian Behlendorf [Thu, 15 Jan 2009 22:16:21 +0000 (14:16 -0800)]
Merge commit 'refs/top-bases/feature-branch' into feature-branch

16 years agoMerge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch
Brian Behlendorf [Thu, 15 Jan 2009 22:16:20 +0000 (14:16 -0800)]
Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch

16 years agoMerge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key
Brian Behlendorf [Thu, 15 Jan 2009 22:16:19 +0000 (14:16 -0800)]
Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key

16 years agoRebase master to b105
Brian Behlendorf [Thu, 15 Jan 2009 21:59:39 +0000 (13:59 -0800)]
Rebase master to b105

16 years agoMerge commit 'refs/top-bases/feature-branch' into feature-branch
Brian Behlendorf [Mon, 5 Jan 2009 20:09:03 +0000 (12:09 -0800)]
Merge commit 'refs/top-bases/feature-branch' into feature-branch

16 years agoMerge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch
Brian Behlendorf [Mon, 5 Jan 2009 20:09:01 +0000 (12:09 -0800)]
Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch

16 years agoMerge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key
Brian Behlendorf [Mon, 5 Jan 2009 20:09:00 +0000 (12:09 -0800)]
Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key

16 years agoAdd unicode library
Brian Behlendorf [Mon, 5 Jan 2009 20:03:23 +0000 (12:03 -0800)]
Add unicode library

16 years agoMerge commit 'refs/top-bases/feature-branch' into feature-branch
Brian Behlendorf [Mon, 5 Jan 2009 19:11:55 +0000 (11:11 -0800)]
Merge commit 'refs/top-bases/feature-branch' into feature-branch

16 years agoMerge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch
Brian Behlendorf [Mon, 5 Jan 2009 19:11:54 +0000 (11:11 -0800)]
Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch

16 years agoMerge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key
Brian Behlendorf [Mon, 5 Jan 2009 19:11:54 +0000 (11:11 -0800)]
Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key

16 years agoRemove zdump, it's an unrelateds command which I added simply due to the z* command...
Brian Behlendorf [Mon, 5 Jan 2009 19:10:13 +0000 (11:10 -0800)]
Remove zdump, it's an unrelateds command which I added simply due to the z* command convention

16 years agoResolve time conflict
Brian Behlendorf [Thu, 18 Dec 2008 19:41:30 +0000 (11:41 -0800)]
Resolve time conflict

16 years agoMerge branch 'feature-commit-cb' into refs/top-bases/feature-branch
Brian Behlendorf [Thu, 18 Dec 2008 19:34:24 +0000 (11:34 -0800)]
Merge branch 'feature-commit-cb' into refs/top-bases/feature-branch

16 years agoMerge commit 'refs/top-bases/feature-branch' into feature-branch
Brian Behlendorf [Thu, 18 Dec 2008 19:34:24 +0000 (11:34 -0800)]
Merge commit 'refs/top-bases/feature-branch' into feature-branch

16 years agoRevert changes from this branch so the branch may be removed. We
Brian Behlendorf [Thu, 18 Dec 2008 19:31:32 +0000 (11:31 -0800)]
Revert changes from this branch so the branch may be removed.  We
will integrate the latest patch from Sun here once everything is
is basically working.  This verion of the patch is out of date
anyone and may not be what is needed.

16 years agoMerge commit 'refs/top-bases/feature-branch' into feature-branch
Brian Behlendorf [Thu, 18 Dec 2008 18:06:00 +0000 (10:06 -0800)]
Merge commit 'refs/top-bases/feature-branch' into feature-branch

16 years agoMerge branch 'feature-commit-cb' into refs/top-bases/feature-branch
Brian Behlendorf [Thu, 18 Dec 2008 18:05:59 +0000 (10:05 -0800)]
Merge branch 'feature-commit-cb' into refs/top-bases/feature-branch

16 years agoAdd dropping written variable declaration
Brian Behlendorf [Thu, 18 Dec 2008 18:03:57 +0000 (10:03 -0800)]
Add dropping written variable declaration

16 years agoMerge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key
Brian Behlendorf [Fri, 12 Dec 2008 21:46:56 +0000 (13:46 -0800)]
Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key

16 years agoMerge commit 'refs/top-bases/feature-branch' into feature-branch
Brian Behlendorf [Fri, 12 Dec 2008 21:46:56 +0000 (13:46 -0800)]
Merge commit 'refs/top-bases/feature-branch' into feature-branch

16 years agoMerge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch
Brian Behlendorf [Fri, 12 Dec 2008 21:46:56 +0000 (13:46 -0800)]
Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch

16 years agoMerge branch 'feature-commit-cb' into refs/top-bases/feature-branch
Brian Behlendorf [Fri, 12 Dec 2008 21:46:55 +0000 (13:46 -0800)]
Merge branch 'feature-commit-cb' into refs/top-bases/feature-branch

16 years agoMerge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb
Brian Behlendorf [Fri, 12 Dec 2008 21:46:54 +0000 (13:46 -0800)]
Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb

16 years agoRemove zcommon reference merged in to zpool
Brian Behlendorf [Fri, 12 Dec 2008 21:41:20 +0000 (13:41 -0800)]
Remove zcommon reference merged in to zpool

16 years agoMerge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key
Brian Behlendorf [Thu, 11 Dec 2008 23:41:51 +0000 (15:41 -0800)]
Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key

16 years agoMerge commit 'refs/top-bases/feature-branch' into feature-branch
Brian Behlendorf [Thu, 11 Dec 2008 23:41:51 +0000 (15:41 -0800)]
Merge commit 'refs/top-bases/feature-branch' into feature-branch

16 years agoMerge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch
Brian Behlendorf [Thu, 11 Dec 2008 23:41:51 +0000 (15:41 -0800)]
Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch

16 years agoMerge branch 'feature-commit-cb' into refs/top-bases/feature-branch
Brian Behlendorf [Thu, 11 Dec 2008 23:41:50 +0000 (15:41 -0800)]
Merge branch 'feature-commit-cb' into refs/top-bases/feature-branch

16 years agoMerge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb
Brian Behlendorf [Thu, 11 Dec 2008 23:41:49 +0000 (15:41 -0800)]
Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb

16 years agoMoving lib/libspl to linux-libspl branch
Brian Behlendorf [Thu, 11 Dec 2008 23:38:59 +0000 (15:38 -0800)]
Moving lib/libspl to linux-libspl branch

16 years agoMerge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key
Brian Behlendorf [Thu, 11 Dec 2008 22:25:30 +0000 (14:25 -0800)]
Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key

16 years agoMerge commit 'refs/top-bases/feature-branch' into feature-branch
Brian Behlendorf [Thu, 11 Dec 2008 22:25:30 +0000 (14:25 -0800)]
Merge commit 'refs/top-bases/feature-branch' into feature-branch

16 years agoMerge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch
Brian Behlendorf [Thu, 11 Dec 2008 22:25:30 +0000 (14:25 -0800)]
Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch

16 years agoMerge branch 'feature-commit-cb' into refs/top-bases/feature-branch
Brian Behlendorf [Thu, 11 Dec 2008 22:25:29 +0000 (14:25 -0800)]
Merge branch 'feature-commit-cb' into refs/top-bases/feature-branch

16 years agoMerge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb
Brian Behlendorf [Thu, 11 Dec 2008 22:25:28 +0000 (14:25 -0800)]
Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb