From owner-svn-src-head@FreeBSD.ORG Sat Jun 29 19:17:23 2013 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id ACEC91DC; Sat, 29 Jun 2013 19:17:23 +0000 (UTC) (envelope-from mm@FreeBSD.org) Received: from mail.vx.sk (mail.vx.sk [176.9.45.25]) by mx1.freebsd.org (Postfix) with ESMTP id 6E0531129; Sat, 29 Jun 2013 19:17:23 +0000 (UTC) Received: from core.vx.sk (localhost [127.0.0.2]) by mail.vx.sk (Postfix) with ESMTP id AB66C26114; Sat, 29 Jun 2013 21:17:15 +0200 (CEST) X-Virus-Scanned: amavisd-new at mail.vx.sk Received: from mail.vx.sk by core.vx.sk (amavisd-new, unix socket) with LMTP id 4tMfPQeuYZN7; Sat, 29 Jun 2013 21:17:14 +0200 (CEST) Received: from [10.9.8.1] (chello085216226145.chello.sk [85.216.226.145]) by mail.vx.sk (Postfix) with ESMTPSA id 699F12610C; Sat, 29 Jun 2013 21:17:14 +0200 (CEST) Message-ID: <51CF32B9.2020706@FreeBSD.org> Date: Sat, 29 Jun 2013 21:17:13 +0200 From: Martin Matuska User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:17.0) Gecko/20130620 Thunderbird/17.0.7 MIME-Version: 1.0 To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r252380 - head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs References: <201306291645.r5TGjbGa037257@svn.freebsd.org> In-Reply-To: <201306291645.r5TGjbGa037257@svn.freebsd.org> X-Enigmail-Version: 1.5.1 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Cc: netchild@FreeBSD.org X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 29 Jun 2013 19:17:23 -0000 s/ale@FreeBSD.org/netchild@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 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