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

[Martin Matuska]

s/ale at FreeBSD.org/netchild at FreeBSD.org/g

On 29.6.2013 18:45, Martin Matuska wrote:
> Author: mm
> Date: Sat Jun 29 16:45:37 2013
> New Revision: 252380
> URL: http://svnweb.freebsd.org/changeset/base/252380
>
> Log:
>   Unbreak "zfs jail" and "zfs unjail" (broken since r248571)
>   
>   I missed to register zfs_ioc_jail and zfs_ioc_unjail as legacy ioctl's
>   with the new zfs_ioctl_register_legacy() function.
>   
>   These operations do not modify pools or datasets so there is no need to
>   log them to pool history.
>   
>   Reported by:	Alexander Leidinger <ale at FreeBSD.org> and others on current@
>   MFC after:	3 days
>
> Modified:
>   head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c
>
> Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c
> ==============================================================================
> --- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c	Sat Jun 29 16:05:44 2013	(r252379)
> +++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c	Sat Jun 29 16:45:37 2013	(r252380)
> @@ -5570,6 +5570,13 @@ zfs_ioctl_init(void)
>  	zfs_ioctl_register_dataset_nolog(ZFS_IOC_TMP_SNAPSHOT,
>  	    zfs_ioc_tmp_snapshot, zfs_secpolicy_tmp_snapshot,
>  	    POOL_CHECK_SUSPENDED | POOL_CHECK_READONLY);
> +
> +#ifdef __FreeBSD__
> +	zfs_ioctl_register_dataset_nolog(ZFS_IOC_JAIL, zfs_ioc_jail,
> +	    zfs_secpolicy_config, POOL_CHECK_NONE);
> +	zfs_ioctl_register_dataset_nolog(ZFS_IOC_UNJAIL, zfs_ioc_unjail,
> +	    zfs_secpolicy_config, POOL_CHECK_NONE);
> +#endif
>  }
>  
>  int


-- 
Martin Matuska
FreeBSD committer
http://blog.vx.sk