Merge branch 'gcc-branch' into refs/top-bases/zfs-branch

Merge commit 'refs/top-bases/gcc-branch' into gcc-branch

Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch

Extra uninit vars flagged by gcc 4.1.2

Newer versions of the compiler are OK with this but for the sake of
older compilers explicitly initialize them.

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

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

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

New TopGit dependency: fix-stack-lzjb

Add fix-stack-lzjb topic branch

Reduce kernel stack usage by lzjb_compress() by moving uint16 array
off the stack and on to the heap.  The exact performance implications
of this I have not measured but we absolutely need to keep stack
usage to a minimum.  If/when this becomes and issue we optimize.

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

Merge branch 'fix-kstat-xuio' into refs/top-bases/fix-branch

New TopGit dependency: fix-kstat-xuio

Add fix-kstat-xuio topic branch

Move xiou stat structures from a header to the dmu.c source as is
done with all the other kstat interfaces.  This information is local
to dmu.c registered the xuio kstat and should stay that way.

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

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

New TopGit dependency: fix-metaslab

Add fix-metaslab topic branch

If your only going to allow one allocator to be used and it is defined
at compile time there is no point including the others in the build.
This patch could/should be refined for Linux to make the metaslab
configurable at run time.  That might be a bit tricky however since
you would need to quiese all IO.  Short of that making it configurable
as a module load option would be a reasonable compromise.

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

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

New TopGit dependency: fix-current

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.

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

Conflicts:

cmd/ztest/ztest.c

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

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

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

New TopGit dependency: fix-pthreads

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.

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

Merge branch 'gcc-branch' into refs/top-bases/zfs-branch

Merge commit 'refs/top-bases/gcc-branch' into gcc-branch

Merge branch 'gcc-missing-braces' into refs/top-bases/gcc-branch

Update gcc-missing-braces based on structure changes

Almost exclusively this patch handled the addition of another char
array to the zfs_cmd_t structure.  Unfortunately c90 doesn't allow
zero filling the entire struct with the '= { 0 };' shorthand.

Merge branch 'gcc-branch' into refs/top-bases/zfs-branch

Merge commit 'refs/top-bases/gcc-branch' into gcc-branch

Merge branch 'gcc-unused' into refs/top-bases/gcc-branch

Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch

Merge branch 'gcc-no-parenthesis' into refs/top-bases/gcc-branch

Merge branch 'gcc-missing-case' into refs/top-bases/gcc-branch

Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch

Merge branch 'gcc-c90' into refs/top-bases/gcc-branch

Update gcc-c90 minor updates

Originally these changes were on other gcc-* topic branches but
because c90 touches the same bit of code and I'd like to keep all
the gcc-* branches completely parallel I've moved these few bits
over here.  This is one of the downsides of not just having one
big patch stack.

Update gcc-unused

Fix new instances or changes in gcc flagged unused code.  These are
mostly related to variables which are not used when debugging is
disabled and the ASSERTs are compiled out.

Update gcc-invalid-prototypes

Fix new invalid prototypes, typically just a missing void arg.

Update gcc-unit

Fix new possibly uninitialized variables according to gcc.

Update gcc-missing-case

Fix new locations of an incomplete case statement.

Update gcc-no-parenthesis

Fix new locations of missing parenthesis according to gcc.

Update gcc-c90

Additional c90 fixes required due to ZFS update, these include fixing new
places c99 specific things have been done and some cleanup of old usage.

Merge branch 'gcc-branch' into refs/top-bases/zfs-branch

Merge commit 'refs/top-bases/gcc-branch' into gcc-branch

Merge branch 'gcc-cast' into refs/top-bases/gcc-branch

Update gcc-cast

Fix new instances of missing casts or assumed types.

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

Merge branch 'gcc-branch' into refs/top-bases/zfs-branch

Conflicts:
cmd/ztest/ztest.c
lib/libzfs/libzfs_sendrecv.c
module/zfs/dmu_objset.c
module/zfs/dnode.c
module/zfs/dnode_sync.c
module/zfs/dsl_dataset.c
module/zfs/include/sys/dmu_tx.h
module/zfs/include/sys/txg.h
module/zfs/spa_history.c

Merge commit 'refs/top-bases/gcc-branch' into gcc-branch

Merge branch 'gcc-fortify-source' into refs/top-bases/gcc-branch

Merge branch 'gcc-missing-braces' into refs/top-bases/gcc-branch

Conflicts:
lib/libzfs/libzfs_pool.c

Merge branch 'gcc-ident-pragmas' into refs/top-bases/gcc-branch

Merge branch 'gcc-64bit-constants' into refs/top-bases/gcc-branch

Merge branch 'gcc-unused' into refs/top-bases/gcc-branch

Conflicts:
module/zfs/dbuf.c
module/zfs/dsl_dataset.c

Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch

Merge branch 'gcc-no-parenthesis' into refs/top-bases/gcc-branch

Merge branch 'gcc-missing-case' into refs/top-bases/gcc-branch

Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch

Conflicts:
cmd/zdb/zdb_il.c

Merge branch 'gcc-init-pragmas' into refs/top-bases/gcc-branch

Merge branch 'gcc-debug' into refs/top-bases/gcc-branch

Merge branch 'gcc-cast' into refs/top-bases/gcc-branch

Conflicts:
cmd/zpool/zpool_main.c
cmd/ztest/ztest.c

Merge branch 'gcc-c90' into refs/top-bases/gcc-branch

Conflicts:
cmd/zdb/zdb.c
cmd/zdb/zdb_il.c
cmd/zfs/zfs_main.c
cmd/zfs/zfs_util.h
cmd/zinject/zinject.h
cmd/zpool/zpool_main.c
cmd/zpool/zpool_util.c
cmd/ztest/ztest.c
lib/libnvpair/include/libnvpair.h
lib/libnvpair/libnvpair.c
lib/libzfs/libzfs_changelist.c
lib/libzfs/libzfs_config.c
lib/libzfs/libzfs_dataset.c
lib/libzfs/libzfs_import.c
lib/libzfs/libzfs_mount.c
lib/libzfs/libzfs_pool.c
lib/libzfs/libzfs_sendrecv.c
module/avl/avl.c
module/avl/include/sys/avl.h
module/nvpair/include/sys/nvpair.h
module/nvpair/nvpair.c
module/zcommon/include/zfs_comutil.h
module/zcommon/include/zfs_prop.h
module/zcommon/zfs_comutil.c
module/zfs/arc.c
module/zfs/dbuf.c
module/zfs/dmu.c
module/zfs/dmu_objset.c
module/zfs/dmu_zfetch.c
module/zfs/dnode_sync.c
module/zfs/dsl_dataset.c
module/zfs/dsl_pool.c
module/zfs/dsl_prop.c
module/zfs/dsl_synctask.c
module/zfs/include/sys/dmu_tx.h
module/zfs/include/sys/dmu_zfetch.h
module/zfs/include/sys/dsl_synctask.h
module/zfs/include/sys/refcount.h
module/zfs/include/sys/txg.h
module/zfs/include/sys/uberblock.h
module/zfs/include/sys/zap_leaf.h
module/zfs/include/sys/zfs_debug.h
module/zfs/include/sys/zfs_znode.h
module/zfs/include/sys/zio_compress.h
module/zfs/include/sys/zvol.h
module/zfs/lzjb.c
module/zfs/metaslab.c
module/zfs/refcount.c
module/zfs/sha256.c
module/zfs/spa.c
module/zfs/spa_boot.c
module/zfs/uberblock.c
module/zfs/vdev.c
module/zfs/zap_micro.c
module/zfs/zfs_ioctl.c
module/zfs/zfs_replay.c
module/zfs/zio.c
module/zfs/zio_compress.c

Merge commit 'refs/top-bases/gcc-unused' into gcc-unused

Conflicts:
module/zfs/dbuf.c
module/zfs/dmu.c
module/zfs/dmu_objset.c
module/zfs/dnode_sync.c
module/zfs/dsl_dataset.c
module/zfs/dsl_prop.c
module/zfs/metaslab.c
module/zfs/spa.c
module/zfs/vdev.c
module/zfs/zap_micro.c

Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit

Conflicts:
cmd/zpool/zpool_main.c
cmd/ztest/ztest.c
module/zfs/arc.c

Merge commit 'refs/top-bases/gcc-no-parenthesis' into gcc-no-parenthesis

Conflicts:
lib/libzfs/libzfs_dataset.c
module/zfs/dmu_objset.c
module/zfs/dsl_dataset.c
module/zfs/dsl_pool.c
module/zfs/spa.c
module/zfs/zfs_ioctl.c
module/zfs/zio.c

Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case

Conflicts:
lib/libzfs/libzfs_changelist.c
module/zfs/spa.c
module/zfs/zfs_ioctl.c

Merge commit 'refs/top-bases/gcc-missing-braces' into gcc-missing-braces

Conflicts:
cmd/zdb/zdb.c
cmd/ztest/ztest.c
lib/libzfs/libzfs_dataset.c
lib/libzfs/libzfs_pool.c
lib/libzfs/libzfs_sendrecv.c

Merge commit 'refs/top-bases/gcc-invalid-prototype' into gcc-invalid-prototype

Conflicts:
cmd/zdb/zdb_il.c
cmd/ztest/ztest.c
lib/libzfs/libzfs_mount.c

Merge commit 'refs/top-bases/gcc-init-pragmas' into gcc-init-pragmas

Conflicts:
lib/libzfs/libzfs_mount.c

Merge commit 'refs/top-bases/gcc-fortify-source' into gcc-fortify-source

Conflicts:
cmd/zdb/zdb.c

Merge commit 'refs/top-bases/gcc-debug' into gcc-debug

Merge commit 'refs/top-bases/gcc-cast' into gcc-cast

Conflicts:
cmd/zfs/zfs_main.c
cmd/zpool/zpool_main.c
cmd/ztest/ztest.c

Merge commit 'refs/top-bases/gcc-64bit-constants' into gcc-64bit-constants

Conflicts:
cmd/ztest/ztest.c
module/zfs/include/sys/zfs_znode.h

Merge commit 'refs/top-bases/gcc-ident-pragmas' into gcc-ident-pragmas

Conflicts:
cmd/zfs/zfs_util.h
cmd/zinject/zinject.h
cmd/zpool/zpool_util.c
lib/libnvpair/include/libnvpair.h
lib/libnvpair/libnvpair.c
lib/libzfs/libzfs_config.c
lib/libzfs/libzfs_import.c
module/avl/avl.c
module/avl/include/sys/avl.h
module/nvpair/include/sys/nvpair.h
module/nvpair/nvpair.c
module/zcommon/include/zfs_comutil.h
module/zcommon/include/zfs_prop.h
module/zcommon/zfs_comutil.c
module/zfs/dmu_zfetch.c
module/zfs/dsl_synctask.c
module/zfs/include/sys/dmu_tx.h
module/zfs/include/sys/dmu_zfetch.h
module/zfs/include/sys/dsl_synctask.h
module/zfs/include/sys/refcount.h
module/zfs/include/sys/txg.h
module/zfs/include/sys/uberblock.h
module/zfs/include/sys/zap_leaf.h
module/zfs/include/sys/zfs_debug.h
module/zfs/include/sys/zio_compress.h
module/zfs/include/sys/zvol.h
module/zfs/lzjb.c
module/zfs/refcount.c
module/zfs/sha256.c
module/zfs/spa_boot.c
module/zfs/uberblock.c
module/zfs/zfs_replay.c
module/zfs/zio_compress.c

Merge commit 'refs/top-bases/gcc-c90' into gcc-c90

Conflicts:
cmd/zdb/zdb.c
cmd/ztest/ztest.c
module/zfs/dbuf.c
module/zfs/dsl_dataset.c
module/zfs/dsl_scrub.c
module/zfs/spa.c
module/zfs/vdev.c
module/zfs/zio.c

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

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

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

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

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

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

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

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

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

Conflicts:
lib/libzfs/libzfs_sendrecv.c

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

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

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

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

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

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

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

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

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

Conflicts:
module/zfs/dsl_dataset.c

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

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

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