granicus.if.org Git

Brian Behlendorf [Mon, 14 Jun 2010 23:39:27 +0000 (16:39 -0700)]

Merge branch 'fix-current' into refs/top-bases/fix-branch

Brian Behlendorf [Mon, 14 Jun 2010 23:38:56 +0000 (16:38 -0700)]

Add fix-current topic branch

In the linux kernel 'current' is defined to mean the current process
and can never be used as a local variable in a function. Simply
replace all usage of 'current' with 'curr' in this function.

commit | commitdiff | tree

Brian Behlendorf [Mon, 14 Jun 2010 23:22:00 +0000 (16:22 -0700)]

Merge branch 'fix-pthreads' into refs/top-bases/fix-branch

commit | commitdiff | tree

Brian Behlendorf [Mon, 14 Jun 2010 23:21:59 +0000 (16:21 -0700)]

Merge branch 'fix-taskq' into refs/top-bases/fix-branch

commit | commitdiff | tree

Brian Behlendorf [Mon, 14 Jun 2010 23:20:44 +0000 (16:20 -0700)]

Add fix-pthreads topic branch

This is a portability change which removes the dependence of the Solaris
thread library. All locations where Solaris thread API was used before
have been replaced with equivilant Solaris kernel style thread calls.
In user space the kernel style threading API is implemented in term of
the portable pthreads library. This includes all threads, mutexs,
condition variables, reader/writer locks, and taskqs.

commit | commitdiff | tree

Brian Behlendorf [Mon, 14 Jun 2010 23:14:23 +0000 (16:14 -0700)]

Update fix-taskq to never sleep at interrupt time

Updated fix to detect if we are in an interrupt and only sleep if it
is safe to do some. I guess it must be safe to sleep under Solaris
this must be handled in a sort interrupt handler there

commit | commitdiff | tree

Brian Behlendorf [Fri, 28 May 2010 20:54:54 +0000 (13:54 -0700)]

Merge branch 'fix-error-handling' into refs/top-bases/fix-branch

commit | commitdiff | tree

Brian Behlendorf [Fri, 28 May 2010 20:54:54 +0000 (13:54 -0700)]

Merge commit 'refs/top-bases/fix-error-handling' into fix-error-handling

commit | commitdiff | tree

Brian Behlendorf [Fri, 28 May 2010 20:54:53 +0000 (13:54 -0700)]

Merge branch 'fix-acl' into refs/top-bases/fix-branch

commit | commitdiff | tree

Brian Behlendorf [Fri, 28 May 2010 20:54:53 +0000 (13:54 -0700)]

Merge branch 'fix-deadcode' into refs/top-bases/fix-branch

commit | commitdiff | tree

Brian Behlendorf [Fri, 28 May 2010 20:54:53 +0000 (13:54 -0700)]

Merge commit 'refs/top-bases/fix-acl' into fix-acl

commit | commitdiff | tree

Brian Behlendorf [Fri, 28 May 2010 20:54:52 +0000 (13:54 -0700)]

Merge branch 'fix-strncat' into refs/top-bases/fix-branch

commit | commitdiff | tree

Brian Behlendorf [Fri, 28 May 2010 20:54:52 +0000 (13:54 -0700)]

Merge commit 'refs/top-bases/fix-deadcode' into fix-deadcode

commit | commitdiff | tree

Brian Behlendorf [Fri, 28 May 2010 20:54:49 +0000 (13:54 -0700)]

Merge commit 'refs/top-bases/fix-strncat' into fix-strncat

Conflicts:
lib/libzfs/libzfs_sendrecv.c

commit | commitdiff | tree

Brian Behlendorf [Fri, 28 May 2010 20:54:13 +0000 (13:54 -0700)]

Merge branch 'fix-list' into refs/top-bases/fix-branch

commit | commitdiff | tree

Brian Behlendorf [Fri, 28 May 2010 20:54:12 +0000 (13:54 -0700)]

Merge commit 'refs/top-bases/fix-taskq' into fix-taskq

commit | commitdiff | tree

Brian Behlendorf [Fri, 28 May 2010 20:54:12 +0000 (13:54 -0700)]

Merge branch 'fix-taskq' into refs/top-bases/fix-branch

commit | commitdiff | tree

Brian Behlendorf [Fri, 28 May 2010 20:54:12 +0000 (13:54 -0700)]

Merge commit 'refs/top-bases/fix-list' into fix-list

commit | commitdiff | tree

Brian Behlendorf [Fri, 28 May 2010 20:54:11 +0000 (13:54 -0700)]

Merge branch 'fix-stack' into refs/top-bases/fix-branch

commit | commitdiff | tree

Brian Behlendorf [Fri, 28 May 2010 20:54:08 +0000 (13:54 -0700)]

Merge commit 'refs/top-bases/fix-stack' into fix-stack

Conflicts:
module/zfs/dmu_objset.c
module/zfs/spa_history.c

commit | commitdiff | tree

Brian Behlendorf [Fri, 28 May 2010 20:52:55 +0000 (13:52 -0700)]

Merge branch 'fix-rwlocks' into refs/top-bases/fix-branch

commit | commitdiff | tree

Brian Behlendorf [Fri, 28 May 2010 20:52:52 +0000 (13:52 -0700)]

Merge commit 'refs/top-bases/fix-rwlocks' into fix-rwlocks

Conflicts:
module/zfs/dsl_dataset.c

commit | commitdiff | tree

Brian Behlendorf [Fri, 28 May 2010 20:52:29 +0000 (13:52 -0700)]

Merge branch 'fix-no-zmod' into refs/top-bases/fix-branch

commit | commitdiff | tree

Brian Behlendorf [Fri, 28 May 2010 20:52:29 +0000 (13:52 -0700)]

Merge commit 'refs/top-bases/fix-no-zmod' into fix-no-zmod

commit | commitdiff | tree

Brian Behlendorf [Fri, 28 May 2010 20:52:28 +0000 (13:52 -0700)]

Merge branch 'fix-newlines' into refs/top-bases/fix-branch

commit | commitdiff | tree

Brian Behlendorf [Fri, 28 May 2010 20:52:28 +0000 (13:52 -0700)]

Merge branch 'fix-evict-dbufs' into refs/top-bases/fix-branch

commit | commitdiff | tree

Brian Behlendorf [Fri, 28 May 2010 20:52:28 +0000 (13:52 -0700)]

Merge commit 'refs/top-bases/fix-newlines' into fix-newlines

commit | commitdiff | tree

Brian Behlendorf [Fri, 28 May 2010 20:52:27 +0000 (13:52 -0700)]

Merge branch 'fix-dnode-cons' into refs/top-bases/fix-branch

commit | commitdiff | tree

Brian Behlendorf [Fri, 28 May 2010 20:52:27 +0000 (13:52 -0700)]

Merge commit 'refs/top-bases/fix-evict-dbufs' into fix-evict-dbufs

commit | commitdiff | tree

Brian Behlendorf [Fri, 28 May 2010 20:52:23 +0000 (13:52 -0700)]

Merge commit 'refs/top-bases/fix-dnode-cons' into fix-dnode-cons

Conflicts:
module/zfs/dnode.c

commit | commitdiff | tree

Brian Behlendorf [Fri, 28 May 2010 20:51:29 +0000 (13:51 -0700)]

Merge branch 'fix-dbuf_dirty_record_t' into refs/top-bases/fix-branch

Conflicts:
lib/libzfs/libzfs_sendrecv.c
module/zfs/dmu_objset.c
module/zfs/dnode.c
module/zfs/dsl_dataset.c
module/zfs/spa_history.c

commit | commitdiff | tree

Brian Behlendorf [Fri, 28 May 2010 20:46:45 +0000 (13:46 -0700)]

Merge commit 'refs/top-bases/fix-dbuf_dirty_record_t' into fix-dbuf_dirty_record_t

Conflicts:
module/zfs/dnode_sync.c

commit | commitdiff | tree

Brian Behlendorf [Fri, 28 May 2010 20:45:14 +0000 (13:45 -0700)]

Update core ZFS code from build 121 to build 141.

commit | commitdiff | tree

Brian Behlendorf [Fri, 28 May 2010 19:20:30 +0000 (12:20 -0700)]

Merge branch 'fix-get-configs' into refs/top-bases/fix-branch

commit | commitdiff | tree

Brian Behlendorf [Fri, 28 May 2010 19:18:45 +0000 (12:18 -0700)]

Revert fix-get-configs should no longer be needed

commit | commitdiff | tree

Brian Behlendorf [Fri, 28 May 2010 17:14:42 +0000 (10:14 -0700)]

Merge branch 'fix-dsl_pool_t' into refs/top-bases/fix-branch

commit | commitdiff | tree

Brian Behlendorf [Fri, 28 May 2010 17:08:02 +0000 (10:08 -0700)]

Revert fix-dsl_pool_t fixed upstream

commit | commitdiff | tree

Brian Behlendorf [Fri, 28 May 2010 17:00:43 +0000 (10:00 -0700)]

Merge branch 'fix-taskq' into refs/top-bases/fix-branch

commit | commitdiff | tree

Brian Behlendorf [Fri, 28 May 2010 16:54:03 +0000 (09:54 -0700)]

Revert fix-taskq changes reevaluate after update.

commit | commitdiff | tree

Brian Behlendorf [Fri, 28 May 2010 00:02:13 +0000 (17:02 -0700)]

Merge branch 'fix-clock-wrap' into refs/top-bases/fix-branch

commit | commitdiff | tree

Brian Behlendorf [Thu, 27 May 2010 23:54:23 +0000 (16:54 -0700)]

Revert fix-clock-wrap fixed upstream

This was more or less fixed upstream. Instead of directly accessing
lbolt they now use ddi_get_lbolt() which we can have do the right
thing is the SPL so we don't need to carry this patch.

commit | commitdiff | tree

Brian Behlendorf [Tue, 18 May 2010 22:01:03 +0000 (15:01 -0700)]

Merge branch 'fix-error-handling' into refs/top-bases/fix-branch

commit | commitdiff | tree

Brian Behlendorf [Tue, 18 May 2010 22:01:02 +0000 (15:01 -0700)]

Merge commit 'refs/top-bases/fix-error-handling' into fix-error-handling

commit | commitdiff | tree

Brian Behlendorf [Tue, 18 May 2010 22:01:02 +0000 (15:01 -0700)]

Merge branch 'fix-acl' into refs/top-bases/fix-branch

commit | commitdiff | tree

Brian Behlendorf [Tue, 18 May 2010 22:01:01 +0000 (15:01 -0700)]

Merge commit 'refs/top-bases/fix-acl' into fix-acl

commit | commitdiff | tree

Brian Behlendorf [Tue, 18 May 2010 22:01:00 +0000 (15:01 -0700)]

Merge commit 'refs/top-bases/fix-deadcode' into fix-deadcode

commit | commitdiff | tree

Brian Behlendorf [Tue, 18 May 2010 22:01:00 +0000 (15:01 -0700)]

Merge branch 'fix-deadcode' into refs/top-bases/fix-branch

commit | commitdiff | tree

Brian Behlendorf [Tue, 18 May 2010 22:00:59 +0000 (15:00 -0700)]

Merge commit 'refs/top-bases/fix-strncat' into fix-strncat

commit | commitdiff | tree

Brian Behlendorf [Tue, 18 May 2010 22:00:59 +0000 (15:00 -0700)]

Merge branch 'fix-strncat' into refs/top-bases/fix-branch

commit | commitdiff | tree

Brian Behlendorf [Tue, 18 May 2010 22:00:58 +0000 (15:00 -0700)]

Merge branch 'fix-list' into refs/top-bases/fix-branch

commit | commitdiff | tree

Brian Behlendorf [Tue, 18 May 2010 22:00:57 +0000 (15:00 -0700)]

Merge commit 'refs/top-bases/fix-list' into fix-list

commit | commitdiff | tree

Brian Behlendorf [Tue, 18 May 2010 22:00:57 +0000 (15:00 -0700)]

Merge branch 'fix-taskq' into refs/top-bases/fix-branch

commit | commitdiff | tree

Brian Behlendorf [Tue, 18 May 2010 22:00:56 +0000 (15:00 -0700)]

Merge commit 'refs/top-bases/fix-taskq' into fix-taskq

commit | commitdiff | tree

Brian Behlendorf [Tue, 18 May 2010 22:00:55 +0000 (15:00 -0700)]

Merge commit 'refs/top-bases/fix-stack' into fix-stack

commit | commitdiff | tree

Brian Behlendorf [Tue, 18 May 2010 22:00:55 +0000 (15:00 -0700)]

Merge branch 'fix-stack' into refs/top-bases/fix-branch

commit | commitdiff | tree

Brian Behlendorf [Tue, 18 May 2010 22:00:54 +0000 (15:00 -0700)]

Merge commit 'refs/top-bases/fix-rwlocks' into fix-rwlocks

commit | commitdiff | tree

Brian Behlendorf [Tue, 18 May 2010 22:00:54 +0000 (15:00 -0700)]

Merge branch 'fix-rwlocks' into refs/top-bases/fix-branch

commit | commitdiff | tree

Brian Behlendorf [Tue, 18 May 2010 22:00:53 +0000 (15:00 -0700)]

Merge commit 'refs/top-bases/fix-no-zmod' into fix-no-zmod

commit | commitdiff | tree

Brian Behlendorf [Tue, 18 May 2010 22:00:53 +0000 (15:00 -0700)]

Merge branch 'fix-no-zmod' into refs/top-bases/fix-branch

commit | commitdiff | tree

Brian Behlendorf [Tue, 18 May 2010 22:00:52 +0000 (15:00 -0700)]

Merge branch 'fix-newlines' into refs/top-bases/fix-branch

commit | commitdiff | tree

Brian Behlendorf [Tue, 18 May 2010 22:00:51 +0000 (15:00 -0700)]

Merge commit 'refs/top-bases/fix-newlines' into fix-newlines

commit | commitdiff | tree

Brian Behlendorf [Tue, 18 May 2010 22:00:51 +0000 (15:00 -0700)]

Merge branch 'fix-get-configs' into refs/top-bases/fix-branch

commit | commitdiff | tree

Brian Behlendorf [Tue, 18 May 2010 22:00:50 +0000 (15:00 -0700)]

Merge commit 'refs/top-bases/fix-get-configs' into fix-get-configs

commit | commitdiff | tree

Brian Behlendorf [Tue, 18 May 2010 22:00:49 +0000 (15:00 -0700)]

Merge commit 'refs/top-bases/fix-evict-dbufs' into fix-evict-dbufs

commit | commitdiff | tree

Brian Behlendorf [Tue, 18 May 2010 22:00:49 +0000 (15:00 -0700)]

Merge branch 'fix-evict-dbufs' into refs/top-bases/fix-branch

commit | commitdiff | tree

Brian Behlendorf [Tue, 18 May 2010 22:00:48 +0000 (15:00 -0700)]

Merge commit 'refs/top-bases/fix-dsl_pool_t' into fix-dsl_pool_t

commit | commitdiff | tree

Brian Behlendorf [Tue, 18 May 2010 22:00:48 +0000 (15:00 -0700)]

Merge branch 'fix-dsl_pool_t' into refs/top-bases/fix-branch

commit | commitdiff | tree

Brian Behlendorf [Tue, 18 May 2010 22:00:47 +0000 (15:00 -0700)]

Merge commit 'refs/top-bases/fix-dnode-cons' into fix-dnode-cons

commit | commitdiff | tree

Brian Behlendorf [Tue, 18 May 2010 22:00:47 +0000 (15:00 -0700)]

Merge branch 'fix-dnode-cons' into refs/top-bases/fix-branch

commit | commitdiff | tree

Brian Behlendorf [Tue, 18 May 2010 22:00:46 +0000 (15:00 -0700)]

Merge branch 'fix-dbuf_dirty_record_t' into refs/top-bases/fix-branch

commit | commitdiff | tree

Brian Behlendorf [Tue, 18 May 2010 22:00:45 +0000 (15:00 -0700)]

Merge commit 'refs/top-bases/fix-dbuf_dirty_record_t' into fix-dbuf_dirty_record_t

commit | commitdiff | tree

Brian Behlendorf [Tue, 18 May 2010 22:00:45 +0000 (15:00 -0700)]

Merge branch 'fix-clock-wrap' into refs/top-bases/fix-branch

commit | commitdiff | tree

Brian Behlendorf [Tue, 18 May 2010 22:00:44 +0000 (15:00 -0700)]

Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap

commit | commitdiff | tree

Brian Behlendorf [Tue, 18 May 2010 21:55:01 +0000 (14:55 -0700)]

Add AUTHORS to master branch

commit | commitdiff | tree

Brian Behlendorf [Tue, 18 May 2010 21:33:32 +0000 (14:33 -0700)]

Merge branch 'fix-error-handling' into refs/top-bases/fix-branch

commit | commitdiff | tree

Brian Behlendorf [Tue, 18 May 2010 21:33:31 +0000 (14:33 -0700)]

Merge commit 'refs/top-bases/fix-error-handling' into fix-error-handling

commit | commitdiff | tree

Brian Behlendorf [Tue, 18 May 2010 21:33:31 +0000 (14:33 -0700)]

Merge branch 'fix-acl' into refs/top-bases/fix-branch

commit | commitdiff | tree

Brian Behlendorf [Tue, 18 May 2010 21:33:30 +0000 (14:33 -0700)]

Merge commit 'refs/top-bases/fix-acl' into fix-acl

commit | commitdiff | tree

Brian Behlendorf [Tue, 18 May 2010 21:33:29 +0000 (14:33 -0700)]

Merge commit 'refs/top-bases/fix-deadcode' into fix-deadcode

commit | commitdiff | tree

Brian Behlendorf [Tue, 18 May 2010 21:33:29 +0000 (14:33 -0700)]

Merge branch 'fix-deadcode' into refs/top-bases/fix-branch

commit | commitdiff | tree

Brian Behlendorf [Tue, 18 May 2010 21:33:28 +0000 (14:33 -0700)]

Merge commit 'refs/top-bases/fix-strncat' into fix-strncat

commit | commitdiff | tree

Brian Behlendorf [Tue, 18 May 2010 21:33:28 +0000 (14:33 -0700)]

Merge branch 'fix-strncat' into refs/top-bases/fix-branch

commit | commitdiff | tree

Brian Behlendorf [Tue, 18 May 2010 21:33:27 +0000 (14:33 -0700)]

Merge commit 'refs/top-bases/fix-list' into fix-list

commit | commitdiff | tree

Brian Behlendorf [Tue, 18 May 2010 21:33:27 +0000 (14:33 -0700)]

Merge branch 'fix-list' into refs/top-bases/fix-branch

commit | commitdiff | tree

Brian Behlendorf [Tue, 18 May 2010 21:33:26 +0000 (14:33 -0700)]

Merge branch 'fix-taskq' into refs/top-bases/fix-branch

commit | commitdiff | tree

Brian Behlendorf [Tue, 18 May 2010 21:33:25 +0000 (14:33 -0700)]

Merge commit 'refs/top-bases/fix-taskq' into fix-taskq

commit | commitdiff | tree

Brian Behlendorf [Tue, 18 May 2010 21:33:24 +0000 (14:33 -0700)]

Merge commit 'refs/top-bases/fix-stack' into fix-stack

commit | commitdiff | tree

Brian Behlendorf [Tue, 18 May 2010 21:33:24 +0000 (14:33 -0700)]

Merge branch 'fix-stack' into refs/top-bases/fix-branch

commit | commitdiff | tree

Brian Behlendorf [Tue, 18 May 2010 21:33:23 +0000 (14:33 -0700)]

Merge commit 'refs/top-bases/fix-rwlocks' into fix-rwlocks

commit | commitdiff | tree

Brian Behlendorf [Tue, 18 May 2010 21:33:23 +0000 (14:33 -0700)]

Merge branch 'fix-rwlocks' into refs/top-bases/fix-branch

commit | commitdiff | tree

Brian Behlendorf [Tue, 18 May 2010 21:33:22 +0000 (14:33 -0700)]

Merge commit 'refs/top-bases/fix-no-zmod' into fix-no-zmod

commit | commitdiff | tree

Brian Behlendorf [Tue, 18 May 2010 21:33:22 +0000 (14:33 -0700)]

Merge branch 'fix-no-zmod' into refs/top-bases/fix-branch

commit | commitdiff | tree

Brian Behlendorf [Tue, 18 May 2010 21:33:21 +0000 (14:33 -0700)]

Merge branch 'fix-newlines' into refs/top-bases/fix-branch

commit | commitdiff | tree

Brian Behlendorf [Tue, 18 May 2010 21:33:20 +0000 (14:33 -0700)]

Merge commit 'refs/top-bases/fix-newlines' into fix-newlines

commit | commitdiff | tree

Brian Behlendorf [Tue, 18 May 2010 21:33:19 +0000 (14:33 -0700)]

Merge commit 'refs/top-bases/fix-get-configs' into fix-get-configs

commit | commitdiff | tree

Brian Behlendorf [Tue, 18 May 2010 21:33:19 +0000 (14:33 -0700)]

Merge branch 'fix-get-configs' into refs/top-bases/fix-branch

commit | commitdiff | tree

Brian Behlendorf [Tue, 18 May 2010 21:33:18 +0000 (14:33 -0700)]

Merge commit 'refs/top-bases/fix-evict-dbufs' into fix-evict-dbufs

commit | commitdiff | tree

Brian Behlendorf [Tue, 18 May 2010 21:33:18 +0000 (14:33 -0700)]

Merge branch 'fix-evict-dbufs' into refs/top-bases/fix-branch

commit | commitdiff | tree

Brian Behlendorf [Tue, 18 May 2010 21:33:17 +0000 (14:33 -0700)]

Merge branch 'fix-dsl_pool_t' into refs/top-bases/fix-branch

commit | commitdiff | tree

Brian Behlendorf [Tue, 18 May 2010 21:33:16 +0000 (14:33 -0700)]