Property changes on: sys/contrib/pf
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /head/sys/contrib/pf:r207745


Property changes on: sys/contrib/dev/acpica
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /head/sys/contrib/dev/acpica:r207745

Index: sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
===================================================================
--- sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c	(revision 216926)
+++ sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c	(revision 216927)
@@ -30,6 +30,7 @@
 #include <sys/systm.h>
 #include <sys/sysmacros.h>
 #include <sys/resource.h>
+#include <sys/resourcevar.h>
 #include <sys/vfs.h>
 #include <sys/vnode.h>
 #include <sys/file.h>
@@ -4362,6 +4363,17 @@
 	} */ *ap;
 {
 
+	if (ap->a_vp->v_type == VREG && ap->a_uio->uio_td != NULL) {
+		PROC_LOCK(ap->a_uio->uio_td->td_proc);
+		if (ap->a_uio->uio_offset + ap->a_uio->uio_resid >
+		    lim_cur(ap->a_uio->uio_td->td_proc, RLIMIT_FSIZE)) {
+			psignal(ap->a_uio->uio_td->td_proc, SIGXFSZ);
+			PROC_UNLOCK(ap->a_uio->uio_td->td_proc);
+			return (EFBIG);
+		}
+		PROC_UNLOCK(ap->a_uio->uio_td->td_proc);
+	}
+
 	return (zfs_write(ap->a_vp, ap->a_uio, ioflags(ap->a_ioflag),
 	    ap->a_cred, NULL));
 }

Property changes on: sys/cddl/contrib/opensolaris
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /head/sys/cddl/contrib/opensolaris:r207745


Property changes on: sys/amd64/include/xen
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /head/sys/amd64/include/xen:r207745


Property changes on: sys
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /head/sys:r207745