[Zrouter-src-freebsd] ZRouter.org: push to FreeBSD HEAD tree

[zrouter-src-freebsd at zrouter.org]

details:   http://zrouter.org/hg/FreeBSD/head//rev/bfc8c4053ba0
changeset: 396:bfc8c4053ba0
user:      ray at terran.dlink.ua
date:      Fri Mar 02 17:15:36 2012 +0200
description:
Update to FreeBSD-HEAD @232391

diffstat:

 head/sys/cddl/compat/opensolaris/sys/vnode.h                     |  5 +++--
 head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c |  4 ++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diffs (43 lines):

diff -r e53c8cf8072f -r bfc8c4053ba0 head/sys/cddl/compat/opensolaris/sys/vnode.h
--- a/head/sys/cddl/compat/opensolaris/sys/vnode.h	Fri Mar 02 17:15:27 2012 +0200
+++ b/head/sys/cddl/compat/opensolaris/sys/vnode.h	Fri Mar 02 17:15:36 2012 +0200
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: head/sys/cddl/compat/opensolaris/sys/vnode.h 231949 2012-02-21 01:05:12Z kib $
  */
 
 #ifndef _OPENSOLARIS_SYS_VNODE_H_
@@ -223,7 +223,8 @@
     ssize_t *residp)
 {
 	struct thread *td = curthread;
-	int error, vfslocked, resid;
+	int error, vfslocked;
+	ssize_t resid;
 
 	ASSERT(ioflag == 0);
 	ASSERT(ulimit == RLIM64_INFINITY);
diff -r e53c8cf8072f -r bfc8c4053ba0 head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c
--- a/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c	Fri Mar 02 17:15:27 2012 +0200
+++ b/head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c	Fri Mar 02 17:15:36 2012 +0200
@@ -60,6 +60,7 @@
 #include <sys/dmu_objset.h>
 #include <sys/spa_boot.h>
 #include <sys/sa.h>
+#include <sys/jail.h>
 #include "zfs_comutil.h"
 
 struct mtx zfs_debug_mtx;
@@ -1533,6 +1534,9 @@
 	int		error = 0;
 	int		canwrite;
 
+	if (!prison_allow(td->td_ucred, PR_ALLOW_MOUNT_ZFS))
+		return (EPERM);
+
 	if (vfs_getopt(vfsp->mnt_optnew, "from", (void **)&osname, NULL))
 		return (EINVAL);