svn commit: r297813 - head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs

[Andriy Gapon]

On 11/04/2016 11:57, Steven Hartland wrote:
> Author: smh
> Date: Mon Apr 11 08:57:54 2016
> New Revision: 297813
> URL: https://svnweb.freebsd.org/changeset/base/297813
> 
> Log:
>   Only include sysctl in kernel build
>   
>   Only include sysctl in kernel builds fixing warning about implicit
>   declaration of function 'sysctl_handle_int'.

Steve,

since you've touched this area you might be interested in this PR:
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=204140

>   Sponsored by:	Multiplay
> 
> Modified:
>   head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c
> 
> Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c
> ==============================================================================
> --- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c	Mon Apr 11 07:11:20 2016	(r297812)
> +++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c	Mon Apr 11 08:57:54 2016	(r297813)
> @@ -48,7 +48,7 @@
>  #include <sys/zil_impl.h>
>  #include <sys/dsl_userhold.h>
>  
> -#ifdef __FreeBSD__
> +#if defined(__FreeBSD__) && defined(_KERNEL)
>  #include <sys/sysctl.h>
>  #include <sys/types.h>
>  #endif
> @@ -132,7 +132,7 @@ int zfs_delay_min_dirty_percent = 60;
>  uint64_t zfs_delay_scale = 1000 * 1000 * 1000 / 2000;
>  
>  
> -#ifdef __FreeBSD__
> +#if defined(__FreeBSD__) && defined(_KERNEL)
>  
>  extern int zfs_vdev_async_write_active_max_dirty_percent;
>  
> 


-- 
Andriy Gapon