svn commit: r288169 - stable/8/sys/sys

[Steven Hartland]

Author: smh
Date: Thu Sep 24 10:31:39 2015
New Revision: 288169
URL: https://svnweb.freebsd.org/changeset/base/288169

Log:
  MFC r287886:
  
  Fix kqueue write events for files > 2GB
  
  Relnotes:	YES
  Sponsored by:	Multiplay

Modified:
  stable/8/sys/sys/vnode.h
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/sys/   (props changed)

Modified: stable/8/sys/sys/vnode.h
==============================================================================
--- stable/8/sys/sys/vnode.h	Thu Sep 24 09:35:35 2015	(r288168)
+++ stable/8/sys/sys/vnode.h	Thu Sep 24 10:31:39 2015	(r288169)
@@ -742,7 +742,8 @@ void	vop_rename_fail(struct vop_rename_a
 
 #define	VOP_WRITE_PRE(ap)						\
 	struct vattr va;						\
-	int error, osize, ooffset, noffset;				\
+	int error;							\
+	off_t osize, ooffset, noffset;					\
 									\
 	osize = ooffset = noffset = 0;					\
 	if (!VN_KNLIST_EMPTY((ap)->a_vp)) {				\
@@ -750,7 +751,7 @@ void	vop_rename_fail(struct vop_rename_a
 		if (error)						\
 			return (error);					\
 		ooffset = (ap)->a_uio->uio_offset;			\
-		osize = va.va_size;					\
+		osize = (off_t)va.va_size;				\
 	}
 
 #define VOP_WRITE_POST(ap, ret)						\